From dc1246d5d4e3961d5f85c6ea3ae84356274a6d4d Mon Sep 17 00:00:00 2001
From: Andrew Haines <andrew@haines.org.nz>
Date: Mon, 20 May 2013 12:42:01 +0100
Subject: [PATCH] Fix Rails 4.0 tests

---
 .travis.yml          |  6 ++----
 Gemfile              | 25 +------------------------
 gemfiles/3.0.gemfile |  1 +
 gemfiles/3.1.gemfile |  3 +++
 gemfiles/3.2.gemfile |  3 +++
 gemfiles/4.0.gemfile |  3 +++
 6 files changed, 13 insertions(+), 28 deletions(-)
 create mode 100644 gemfiles/3.0.gemfile
 create mode 100644 gemfiles/3.1.gemfile
 create mode 100644 gemfiles/3.2.gemfile
 create mode 100644 gemfiles/4.0.gemfile

diff --git a/.travis.yml b/.travis.yml
index 2a73bbf..b495e63 100644
--- 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
index 615efa1..4fc6b14 100644
--- 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
new file mode 100644
index 0000000..3098f15
--- /dev/null
+++ 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
new file mode 100644
index 0000000..01a7a4d
--- /dev/null
+++ 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
new file mode 100644
index 0000000..34a7fbe
--- /dev/null
+++ 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
new file mode 100644
index 0000000..eae7afc
--- /dev/null
+++ 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"