Merge pull request #22 from activeadmin-plugins/fix-ci

add rails v6.0 and activeadmin v2.8 to travis matrix

Author: gigorok

.travis.yml

@@ -15,7 +15,16 @@ env:
   matrix:
     - RAILS=5.1.6 AA=1.1.0
     - RAILS=5.2.1 AA=1.4.0
+    - RAILS=5.2.2 AA=2.8.0
+    - RAILS=6.0.0 AA=2.8.0
 
 rvm:
   - 2.4
   - 2.6
+
+jobs:
+  exclude:
+    - rvm: 2.4
+      env: RAILS=5.2.2 AA=2.8.0
+    - rvm: 2.4
+      env: RAILS=6.0.0 AA=2.8.0

Gemfile

@@ -8,10 +8,11 @@ group :test do
   gem 'activeadmin', "~> #{ENV['AA'] || '1.3.1'}"
 
   gem 'rspec-rails'
-  gem 'sqlite3', '~> 1.3.6'
+  gem 'sqlite3'
   gem 'database_cleaner'
   gem 'capybara'
   gem 'selenium-webdriver'
   gem 'chromedriver-helper'
   gem 'byebug'
+  gem 'sassc-rails'
 end

spec/spec_helper.rb

@@ -15,9 +15,7 @@
   system 'rake setup'
 end
 
-require 'active_model'
-# require ActiveRecord to ensure that Ransack loads correctly
-require 'active_record'
+require 'rails/all'
 require 'active_admin'
 ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + "/app/admin"]
 require ENV['RAILS_ROOT'] + '/config/environment.rb'

spec/support/rails_template.rb

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

tasks/test.rake

@@ -7,6 +7,7 @@ task :setup do
     --skip-turbolinks
     --skip-spring
     --skip-bootsnap
+    --skip-webpack-install
     -m
     spec/support/rails_template.rb
   )