move Rails 4.2 to new Gemfile test Rails 5

jfirebaugh · Nov 13, 2016 · f5ac179 · f5ac179
1 parent 49a237d
commit f5ac179
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ gemfile:
   - Gemfile-sprockets2-sprocketsrails2
   - Gemfile-sprockets3-sprocketsrails2
   - Gemfile-rails41
+  - Gemfile-rails42
 before_script:
   - sh -e /etc/init.d/xvfb start
   - export DISPLAY=:99.0
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 gemspec
 
-gem "railties", "~> 4.2.0"
+gem 'rails', '~> 5.0', '>= 5.0.0.1'
 gem "sprockets-rails"
diff --git a/Gemfile-rails42 b/Gemfile-rails42
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gemspec
+
+gem "railties", "~> 4.2.0"
+gem "sprockets-rails"
diff --git a/konacha.gemspec b/konacha.gemspec
@@ -20,8 +20,8 @@ the asset pipeline and engines.}
   gem.version       = "4.0.0"
   gem.license       = "MIT"
 
-  gem.add_dependency "railties", ">= 4.1", "< 5"
-  gem.add_dependency "actionpack", ">= 4.1", "< 5"
+  gem.add_dependency "railties", ">= 4.1", "< 6"
+  gem.add_dependency "actionpack", ">= 4.1", "< 6"
   gem.add_dependency "sprockets", ">= 2", "< 4"
   gem.add_dependency "sprockets-rails", ">= 2", "< 4"
   gem.add_dependency "capybara"
@@ -36,4 +36,5 @@ the asset pipeline and engines.}
   gem.add_development_dependency "tzinfo"
   gem.add_development_dependency "selenium-webdriver"
   gem.add_development_dependency "poltergeist", "~> 1.5"
+  gem.add_development_dependency "rails-controller-testing"
 end