Fix Rails 4.0 tests

drapergem · May 20, 2013 · dc1246d · dc1246d
1 parent 9ce96c8
commit dc1246d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,15 +8,13 @@ rvm:
   - 2.0.0
   - rbx-19mode
   - jruby-19mode
-  - ruby-head
 
 env:
+  - "RAILS_VERSION=4.0"
   - "RAILS_VERSION=3.2"
   - "RAILS_VERSION=3.1"
   - "RAILS_VERSION=3.0"
-  - "RAILS_VERSION=master"
 
 matrix:
   allow_failures:
-    - rvm: ruby-head
-    - env: "RAILS_VERSION=master"
+    - env: "RAILS_VERSION=4.0"
diff --git a/Gemfile b/Gemfile
@@ -13,27 +13,4 @@ end
 
 version = ENV["RAILS_VERSION"] || "3.2"
 
-rails = case version
-when "master"
-  {github: "rails/rails"}
-else
-  "~> #{version}.0"
-end
-
-mongoid = case version
-when "master"
-  {github: "mongoid/mongoid"}
-when "3.2"
-  "~> 3.1.0"
-when "3.1"
-  "~> 3.0.0"
-end
-
-devise = case version
-when "3.1", "3.2"
-  "~> 2.2"
-end
-
-gem "rails", rails
-gem "mongoid", mongoid if mongoid
-gem "devise", devise if devise
+eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)
diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
@@ -0,0 +1 @@
+gem "rails", "~> 3.0.0"
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
@@ -0,0 +1,3 @@
+gem "rails", "~> 3.1.0"
+gem "mongoid", "~> 3.0.0"
+gem "devise", "~> 2.2"
diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
@@ -0,0 +1,3 @@
+gem "rails", "~> 3.2.0"
+gem "mongoid", "~> 3.1.0"
+gem "devise", "~> 2.2"
diff --git a/gemfiles/4.0.gemfile b/gemfiles/4.0.gemfile
@@ -0,0 +1,3 @@
+gem "rails", github: "rails/rails", branch: "4-0-0"
+gem "mongoid", github: "mongoid/mongoid"
+gem "devise", github: "plataformatec/devise"