Merge pull request #85 from mauricio/rails-4-travis-ci

Configuring travis-ci build to run against rails 4 and ruby 2.1 as well
bkeepers · Feb 8, 2014 · 589d316 · 589d316
2 parents b70c203 + 8c84034
commit 589d316
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,12 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 services:
   - mongodb
   - redis
 script: bundle exec rake unattended_spec
 cache: bundler
+gemfile:
+  - Gemfile
+  - Gemfile-rails4
diff --git a/Gemfile-rails4 b/Gemfile-rails4
@@ -0,0 +1,5 @@
+original_gemfile = File.join(File.dirname(__FILE__), 'Gemfile')
+
+eval IO.read(original_gemfile)
+
+gem 'railties', '~> 4.0'