Test against the beta Rails release.

.travis.yml

@@ -1,21 +1,22 @@
 language: ruby
 
 rvm:
-  - 2.1
+  - 2.1.5
-  - 2.2
+  - 2.2.4
 
 gemfile:
   - gemfiles/Gemfile.rails-4.2-stable
   - gemfiles/Gemfile.rails-4.1-stable
+  - gemfiles/Gemfile.rails-5.0-beta
   - Gemfile
 
 matrix:
-  include:
+  exclude:
-    - rvm: 2.2.2
+    - rvm: 2.1.5
-      gemfile: gemfiles/Gemfile.rails-5.0-alpha
+      gemfile: gemfiles/Gemfile.rails-5.0-beta
-  allow_failures:
+  exclude:
-    - rvm: 2.2.2
+    - env: DEVISE_ORM=mongoid
-      gemfile: gemfiles/Gemfile.rails-5.0-alpha
+      gemfile: gemfiles/Gemfile.rails-5.0-beta
 services:
   - mongodb
 

gemfiles/Gemfile.rails-5.0-alpha

@@ -1,41 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: '..'
-
-gem "rails", github: 'rails/rails', branch: 'master'
-gem "arel", github: 'rails/arel'
-gem "rack", github: 'rack/rack'
-gem "sprockets-rails", github: 'rails/sprockets-rails'
-gem "sprockets", github: 'rails/sprockets'
-# gem "omniauth", "~> 1.2.2"
-gem "omniauth", "~>1.3.1"
-gem "oauth2", github: 'twalpole/oauth2', branch: 'rack_master'
-gem "omniauth-oauth2", ">= 1.2.0", "< 1.5.0"
-gem "rdoc"
-
-gem 'activemodel-serializers-xml', github: 'rails/activemodel-serializers-xml'
-
-gem 'rails-controller-testing'
-
-gem 'responders', '~>2.1.1'
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 1.1", require: false
-end
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "jruby-openssl"
-end
-
-platforms :ruby do
-  gem "sqlite3"
-end
-
-# group :mongoid do
-#   gem "mongoid", "~> 4.0.0"
-# end

gemfiles/Gemfile.rails-5.0-beta

@@ -0,0 +1,37 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '5.0.0.beta1'
+gem 'omniauth', '~>1.3.1'
+gem 'oauth2', github: 'twalpole/oauth2', branch: 'rack_master'
+gem 'omniauth-oauth2', '>= 1.2.0', '< 1.5.0'
+gem 'rdoc'
+
+gem 'activemodel-serializers-xml', github: 'rails/activemodel-serializers-xml'
+
+gem 'rails-controller-testing'
+
+gem 'responders', '~>2.1.1'
+
+group :test do
+  gem 'omniauth-facebook'
+  gem 'omniauth-openid', '~> 1.0.1'
+  gem 'webrat', '0.7.3', require: false
+  gem 'mocha', '~> 1.1', require: false
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbc-adapter'
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jruby-openssl'
+end
+
+platforms :ruby do
+  gem 'sqlite3'
+end
+
+# TODO:
+# group :mongoid do
+#   gem 'mongoid', '~> 4.0.0'
+# end

gemfiles/Gemfile.rails-5.0-beta.lock

@@ -1,10 +1,3 @@
-GIT
-  remote: git://github.com/rack/rack.git
-  revision: f4562619c3c669404e39d9b09924bed5a6b71c14
-  specs:
-    rack (2.0.0.alpha)
-      json
-
 GIT
   remote: git://github.com/rails/activemodel-serializers-xml.git
   revision: 1f72d9507c91b1cda10d1d20eac2b74dd6d9d4b9
@@ -15,15 +8,29 @@ GIT
       activesupport
 
 GIT
-  remote: git://github.com/rails/arel.git
+  remote: git://github.com/twalpole/oauth2.git
-  revision: ea2d50706a5f8215ff2346fa562423700b2d2b6e
+  revision: 38e5b4bfe29b7ef87e87a3f323a088914393cfb5
+  branch: rack_master
   specs:
-    arel (7.0.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 2.0)
 
-GIT
+PATH
-  remote: git://github.com/rails/rails.git
+  remote: ..
-  revision: 249e943a0d25f0014e14e52454e01205c9537019
+  specs:
-  branch: master
+    devise (3.5.3)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 5.1)
+      responders
+      warden (~> 1.2.3)
+
+GEM
+  remote: https://rubygems.org/
   specs:
     actioncable (5.0.0.beta1)
       actionpack (= 5.0.0.beta1)
@@ -69,67 +76,7 @@ GIT
       method_source
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    rails (5.0.0.beta1)
+    arel (7.0.0)
-      actioncable (= 5.0.0.beta1)
-      actionmailer (= 5.0.0.beta1)
-      actionpack (= 5.0.0.beta1)
-      actionview (= 5.0.0.beta1)
-      activejob (= 5.0.0.beta1)
-      activemodel (= 5.0.0.beta1)
-      activerecord (= 5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.beta1)
-      sprockets-rails (>= 2.0.0)
-    railties (5.0.0.beta1)
-      actionpack (= 5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
-GIT
-  remote: git://github.com/rails/sprockets-rails.git
-  revision: 54d4fa5a1c8e54b17baacffb49100b977bf37477
-  specs:
-    sprockets-rails (3.0.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-
-GIT
-  remote: git://github.com/rails/sprockets.git
-  revision: 030b7ccdea92b756aab1b8d3620cc7991d98090d
-  specs:
-    sprockets (4.0.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-
-GIT
-  remote: git://github.com/twalpole/oauth2.git
-  revision: 38e5b4bfe29b7ef87e87a3f323a088914393cfb5
-  branch: rack_master
-  specs:
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    devise (3.5.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
-      responders
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
     bcrypt (3.1.10)
     builder (3.2.2)
     celluloid (0.17.2)
@@ -204,11 +151,25 @@ GEM
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
     orm_adapter (0.5.0)
+    rack (2.0.0.alpha)
+      json
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.3)
       rack (>= 1.0)
+    rails (5.0.0.beta1)
+      actioncable (= 5.0.0.beta1)
+      actionmailer (= 5.0.0.beta1)
+      actionpack (= 5.0.0.beta1)
+      actionview (= 5.0.0.beta1)
+      activejob (= 5.0.0.beta1)
+      activemodel (= 5.0.0.beta1)
+      activerecord (= 5.0.0.beta1)
+      activesupport (= 5.0.0.beta1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.0.beta1)
+      sprockets-rails (>= 2.0.0)
     rails-controller-testing (0.0.3)
       rails (>= 4.2)
     rails-deprecated_sanitizer (1.0.3)
@@ -219,12 +180,25 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
+    railties (5.0.0.beta1)
+      actionpack (= 5.0.0.beta1)
+      activesupport (= 5.0.0.beta1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     rdoc (4.2.0)
     redis (3.2.2)
     responders (2.1.1)
       railties (>= 4.2.0, < 5.1)
     ruby-openid (2.7.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -249,7 +223,6 @@ DEPENDENCIES
   activemodel-serializers-xml!
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
-  arel!
   devise!
   jruby-openssl
   mocha (~> 1.1)
@@ -258,13 +231,10 @@ DEPENDENCIES
   omniauth-facebook
   omniauth-oauth2 (>= 1.2.0, < 1.5.0)
   omniauth-openid (~> 1.0.1)
-  rack!
+  rails (= 5.0.0.beta1)
-  rails!
   rails-controller-testing
   rdoc
   responders (~> 2.1.1)
-  sprockets!
-  sprockets-rails!
   sqlite3
   webrat (= 0.7.3)