Skip to content

Commit 0246c1a

Browse files
committed
run spec on rails 4.2, latest AA
1 parent ee03e56 commit 0246c1a

File tree

3 files changed

+5
-21
lines changed

3 files changed

+5
-21
lines changed

Gemfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@ source 'https://rubygems.org'
33
# Specify your gem's dependencies in active_admin_importable.gemspec
44
gemspec
55
group :test do
6-
gem 'rails', '4.1.9'
6+
gem 'rails', '4.2.0'
77
gem 'rspec-rails'
8-
gem 'activeadmin', github: 'activeadmin' , ref: '54bede0558a99ab759f98f9b24e1b0144063a81e'
9-
8+
gem 'activeadmin', github: 'activeadmin' , ref: 'd787029e5523be2eb2ed99816eb0cecca2b72862'
109
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
11-
12-
gem 'devise'
1310
gem 'sass-rails'
1411
gem 'sqlite3'
1512
gem 'launchy'

spec/spec_helper.rb

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,22 @@
88
require "bundler"
99
Bundler.setup
1010

11-
ENV['RAILS'] = '4.1.9'
12-
1311
ENV['RAILS_ENV'] = 'test'
12+
# Ensure the Active Admin load path is happy
13+
require 'rails'
14+
ENV['RAILS'] = Rails.version
1415
ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV['RAILS']}", __FILE__)
15-
1616
# Create the test app if it doesn't exists
1717
unless File.exists?(ENV['RAILS_ROOT'])
1818
system 'rake setup'
1919
end
2020

21-
# Ensure the Active Admin load path is happy
22-
require 'rails'
23-
2421
require 'active_model'
25-
2622
# require ActiveRecord to ensure that Ransack loads correctly
2723
require 'active_record'
28-
2924
require 'active_admin'
3025
ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + "/app/admin"]
31-
3226
require ENV['RAILS_ROOT'] + '/config/environment.rb'
33-
3427
# Disabling authentication in specs so that we don't have to worry about
3528
# it allover the place
3629
ActiveAdmin.application.authentication_method = false
@@ -42,9 +35,6 @@
4235
require 'capybara/rspec'
4336
require 'capybara/poltergeist'
4437

45-
46-
47-
4838
Capybara.register_driver :poltergeist do |app|
4939
Capybara::Poltergeist::Driver.new(app, {
5040
js_errors: true,
@@ -55,10 +45,8 @@
5545
})
5646
end
5747

58-
5948
Capybara.javascript_driver = :poltergeist
6049

61-
6250
RSpec.configure do |config|
6351
config.use_transactional_fixtures = false
6452

spec/support/rails_template.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
run "rm -r test"
2424
run "rm -r spec"
2525

26-
# Setup a root path for devise
2726
route "root :to => 'admin/dashboard#index'"
2827

2928
rake "db:migrate"

0 commit comments

Comments
 (0)