Merge pull request #34 from workgena/aa2.0_compatibility

Prepare for ActiveAdmin 2.0

Author: workgena

.travis.yml

@@ -1,8 +1,22 @@
+sudo: required
+
+language: ruby
+
+addons:
+  chrome: stable
+
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+
 script: bundle exec rspec spec
+
+env:
+  matrix:
+    - RAILS=4.2.0 AA=1.1.0
+    - RAILS=5.2.0 AA=1.4.0
+    - RAILS=5.2.0 AA=2.0.0
+
 rvm:
-  - 2.2.7
-  - 2.3.4
-before_install:
-  - gem install bundler -v '= 1.9.3'
-  - gem update --system
-  - gem --version
+  - 2.4.6
+  - 2.6.3

Gemfile

@@ -1,18 +1,19 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in activeadmin_scoped_collection_actions.gemspec
 gemspec
+
 group :test do
-  gem 'sprockets-rails', '2.3.3'
-  gem 'rails', '~> 5.1'
-  gem 'rspec-rails'
+  gem 'activeadmin', "~> #{ENV['AA'] || '1.4.3'}"
+  gem 'rails', "~> #{ENV['RAILS'] || '4.2.11'}"
+
+  gem 'capybara'
+  gem 'chromedriver-helper'
+  gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
+  gem 'database_cleaner'
   gem 'draper'
-  gem 'activeadmin', '1.0.0'
-  gem 'sass-rails'
-  gem 'sqlite3'
   gem 'launchy'
-  gem 'database_cleaner'
-  gem 'capybara'
+  gem 'rspec-rails'
+  gem 'sass-rails'
   gem 'selenium-webdriver'
-  gem 'poltergeist'
+  gem 'sqlite3', '~> 1.3.6'
 end

active_admin_scoped_collection_actions.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "coffee-rails"
+  spec.add_dependency "activeadmin", ">= 1.1", "< 3.a"
 end

spec/authors_actions_spec.rb

@@ -79,14 +79,16 @@
 
 
   context 'perform Delete-action when cheked only one item' do
-
     let(:delete_author) { Author.first }
 
     before do
-      page.find('#collection_actions_sidebar_section button', text: 'Delete').click
-      page.find("#batch_action_item_#{delete_author.id}").trigger('click')
-      page.within ('body>.active_admin_dialog_mass_update_by_filter') do
-        page.find('button', text: 'OK').click
+      # select one item
+      find("#batch_action_item_#{delete_author.id}", visible: true).click
+      # click "Delete batch"
+      find('#collection_actions_sidebar_section button', text: 'Delete').click
+      # confirm deletion
+      within 'body > .active_admin_dialog_mass_update_by_filter' do
+        find('button', text: 'OK').click
       end
     end
 
@@ -96,7 +98,5 @@
       expect(Author.take.id).not_to eq(delete_author.id)
       expect(page).to have_css("#batch_action_item_#{Author.take.id}")
     end
-
   end
-
 end

spec/spec_helper.rb

@@ -2,36 +2,36 @@
 $LOAD_PATH << File.expand_path('../support', __FILE__)
 
 ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
-require "bundler"
+require 'bundler'
 Bundler.setup
 
 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
+system 'rake setup' unless File.exist?(ENV['RAILS_ROOT'])
 
 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"]
+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
 ActiveAdmin.application.current_user_method = false
 
 require 'rspec/rails'
-require 'support/admin'
 require 'capybara/rails'
 require 'capybara/rspec'
-require 'capybara/poltergeist'
+require 'selenium-webdriver'
 
+require 'support/admin'
+require 'support/capybara'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = false
@@ -47,22 +47,4 @@
   config.after(:each) do
     DatabaseCleaner.clean
   end
-
-end
-
-# RSpec.configure do |config|
-#   config.before(:each, js: true) do
-#     page.driver.browser.manage.window.maximize  if page.driver.browser.respond_to?(:manage)
-#   end
-# end
-# Capybara.javascript_driver = :selenium
-
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, {
-    js_errors: true,
-    timeout: 80,
-    debug: true,
-    :phantomjs_options => ['--debug=no', '--load-images=no']
-  })
 end
-Capybara.javascript_driver = :poltergeist

spec/support/capybara.rb

@@ -0,0 +1,14 @@
+Capybara.server = :webrick
+
+Capybara.configure do |config|
+  config.match = :prefer_exact
+end
+
+Capybara.register_driver :selenium_chrome do |app|
+  options = Selenium::WebDriver::Chrome::Options.new(
+    args: %w[headless disable-gpu no-sandbox]
+  )
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
+end
+
+Capybara.javascript_driver = :selenium_chrome

spec/support/rails_template.rb

@@ -28,9 +28,15 @@
                  "@import \"active_admin_scoped_collection_actions\";\n",
                  after: "@import \"active_admin/base\";\n"
 
-inject_into_file "app/assets/javascripts/active_admin.js.coffee",
-                 "#= require active_admin_scoped_collection_actions\n",
-                 after: "#= require active_admin/base\n"
+if File.file?("app/assets/javascripts/active_admin.js.coffee")
+  inject_into_file "app/assets/javascripts/active_admin.js.coffee",
+                   "#= require active_admin_scoped_collection_actions\n",
+                   after: "#= require active_admin/base\n"
+else
+  inject_into_file "app/assets/javascripts/active_admin.js",
+                  "//= require active_admin_scoped_collection_actions\n",
+                  after: "//= require active_admin/base\n"
+end
 
 run "rm -r test"
 run "rm -r spec"

tasks/test.rake

@@ -1,6 +1,14 @@
-desc "Creates a test rails app for the specs to run against"
+desc 'Creates a test rails app for the specs to run against'
 task :setup do
   require 'rails/version'
-  system("mkdir spec/rails") unless File.exists?("spec/rails")
-  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} -m spec/support/rails_template.rb --skip-spring"
+
+  rails_new_args = %w[
+    --skip-turbolinks
+    --skip-spring
+    --skip-bootsnap
+    -m
+    spec/support/rails_template.rb
+  ].join(' ')
+
+  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} #{rails_new_args}"
 end