Merge pull request #79 from activeadmin-plugins/rails-4-2

Update specs running on rails 4.2

Author: Fivell

Gemfile

@@ -3,13 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_admin_importable.gemspec
 gemspec
 group :test do
-  gem 'rails',  '4.1.9'
+  gem 'rails',  '4.2.0'
   gem 'rspec-rails'
-  gem 'activeadmin', github: 'activeadmin'  , ref: '54bede0558a99ab759f98f9b24e1b0144063a81e'
-
+  gem 'activeadmin', github: 'activeadmin'  , ref: 'd787029e5523be2eb2ed99816eb0cecca2b72862'
   gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
-
-  gem 'devise'
   gem 'sass-rails'
   gem 'sqlite3'
   gem 'launchy'

spec/spec_helper.rb

@@ -8,29 +8,22 @@
 require "bundler"
 Bundler.setup
 
-ENV['RAILS'] = '4.1.9'
-
 ENV['RAILS_ENV'] = 'test'
+# Ensure the Active Admin load path is happy
+require 'rails'
+ENV['RAILS'] = Rails.version
 ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV['RAILS']}", __FILE__)
-
 # Create the test app if it doesn't exists
 unless File.exists?(ENV['RAILS_ROOT'])
   system 'rake setup'
 end
 
-# Ensure the Active Admin load path is happy
-require 'rails'
-
 require 'active_model'
-
 # require ActiveRecord to ensure that Ransack loads correctly
 require 'active_record'
-
 require 'active_admin'
 ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + "/app/admin"]
-
 require ENV['RAILS_ROOT'] + '/config/environment.rb'
-
 # Disabling authentication in specs so that we don't have to worry about
 # it allover the place
 ActiveAdmin.application.authentication_method = false
@@ -42,9 +35,6 @@
 require 'capybara/rspec'
 require 'capybara/poltergeist'
 
-
-
-
 Capybara.register_driver :poltergeist do |app|
   Capybara::Poltergeist::Driver.new(app, {
     js_errors: true,
@@ -55,10 +45,8 @@
   })
 end
 
-
 Capybara.javascript_driver = :poltergeist
 
-
 RSpec.configure do |config|
   config.use_transactional_fixtures = false
 

spec/support/rails_template.rb

@@ -23,7 +23,6 @@
 run "rm -r test"
 run "rm -r spec"
 
-# Setup a root path for devise
 route "root :to => 'admin/dashboard#index'"
 
 rake "db:migrate"