From 451bcb421dc2b64a41dc6a0515400e351b113f9d Mon Sep 17 00:00:00 2001
From: Gonzalo Maldonado <gonzalo@lumoslabs.com>
Date: Fri, 15 Mar 2019 09:56:59 -0700
Subject: [PATCH] Restore changes from /jfirebaugh/konacha/pull/233

---
 .travis.yml     | 5 ++++-
 Gemfile         | 2 +-
 Gemfile-rails42 | 5 +++++
 konacha.gemspec | 7 ++++---
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 Gemfile-rails42

diff --git a/.travis.yml b/.travis.yml
index 203780f..e82a8cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,15 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.0
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
 gemfile:
   - 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
index f58a935..d729c11 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 gemspec
 
-gem "railties", "~> 4.2.0"
+gem "rails", "~> 5.0", ">= 5.0.1"
 gem "sprockets-rails"
diff --git a/Gemfile-rails42 b/Gemfile-rails42
new file mode 100644
index 0000000..f58a935
--- /dev/null
+++ 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
index 1fda73c..7161fe4 100644
--- 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"
@@ -29,11 +29,12 @@ the asset pipeline and engines.}
   gem.add_dependency "tilt"
 
   gem.add_development_dependency "jquery-rails"
-  gem.add_development_dependency "rspec-rails", "~> 3.1"
+  gem.add_development_dependency "rspec-rails", "~> 3.5", ">= 3.5.2"
   gem.add_development_dependency "capybara-firebug", "~> 1.1"
   gem.add_development_dependency "coffee-script"
   gem.add_development_dependency "ejs"
   gem.add_development_dependency "tzinfo"
   gem.add_development_dependency "selenium-webdriver", "~> 2"
   gem.add_development_dependency "poltergeist", "1.9.0"
+  gem.add_development_dependency "rails-controller-testing"
 end