test against Rails 5 / master

activeadmin · Oct 27, 2015 · 2f28105 · 2f28105
1 parent 971718b
commit 2f28105
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ env:
     - RAILS=3.2.22
     - RAILS=4.1.13
     - RAILS=4.2.4
+    - RAILS=master
   global:
     - JRUBY_OPTS="-J-Xmx1024m --debug"
 matrix:
@@ -28,6 +29,10 @@ matrix:
       env: RAILS=3.2.22
     - rvm: jruby-9.0.0.0
       env: RAILS=3.2.22
+    - rvm: 1.9
+      env: RAILS=master
+  allow_failures:
+    - env: RAILS=master
 notifications:
   irc:
     channels:

diff --git a/Gemfile b/Gemfile
@@ -5,9 +5,9 @@ gemspec
 require File.expand_path 'spec/support/detect_rails_version', File.dirname(__FILE__)
 
 rails_version = detect_rails_version
-gem 'rails', rails_version
+gem 'rails', rails_version == 'master' ? {github: 'rails/rails'} : rails_version
 
-jquery_ui_rails_version = rails_version > "4" ? "~> 5.0" : "~> 4.0"
+jquery_ui_rails_version = rails_version > '4' || rails_version == 'master' ? '~> 5.0' : '~> 4.0'
 gem 'jquery-ui-rails', jquery_ui_rails_version
 
 # Optional dependencies