Skip to content

Commit a026fca

Browse files
authored
Update test environment to match ActiveAdmin 2.6 (#37)
1 parent fb983ba commit a026fca

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111
.DS_Store
1212
/spec/rails
1313
.versions.conf
14+
vendor/bundle
15+
bin

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ script: bundle exec rspec spec
1313

1414
env:
1515
matrix:
16-
- RAILS=4.2.0 AA=1.1.0
1716
- RAILS=5.2.0 AA=1.4.0
1817
- RAILS=5.2.0 AA=2.0.0
18+
- RAILS=6.0.0 AA=2.6.0
1919

2020
rvm:
21-
- 2.4.6
22-
- 2.6.3
21+
- 2.5
22+
- 2.6

Gemfile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ source 'https://rubygems.org'
33
gemspec
44

55
group :test do
6-
gem 'activeadmin', "~> #{ENV['AA'] || '2.0.0'}"
7-
gem 'rails', "~> #{ENV['RAILS'] || '5.2.0'}"
6+
gem 'rails', "~> #{ENV['RAILS'] || '6.0.0'}"
7+
gem 'activeadmin', "~> #{ENV['AA'] || '2.6.0'}"
88

9-
gem 'capybara'
10-
gem 'chromedriver-helper'
9+
gem 'sprockets-rails', '3.0.4'
10+
gem 'rspec-rails'
1111
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
12+
gem 'sass-rails'
13+
gem 'sqlite3', '~> 1.4.0'
14+
gem 'launchy'
1215
gem 'database_cleaner'
16+
gem 'capybara'
17+
gem 'webdrivers'
18+
gem 'byebug'
1319
gem 'draper'
14-
gem 'launchy'
15-
gem 'rspec-rails'
16-
gem 'sass-rails'
17-
gem 'selenium-webdriver'
18-
gem 'sqlite3', '~> 1.3.6'
1920
end

spec/spec_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
require 'active_model'
1818
# require ActiveRecord to ensure that Ransack loads correctly
1919
require 'active_record'
20+
require 'action_view'
2021
require 'active_admin'
2122
ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + '/app/admin']
2223
require ENV['RAILS_ROOT'] + '/config/environment.rb'

0 commit comments

Comments
 (0)