From 8b8eeebe9d9abfd40ea141fc6e5eadb3b3565e42 Mon Sep 17 00:00:00 2001
From: Chris Beer <cabeer@stanford.edu>
Date: Wed, 30 Oct 2019 16:36:30 -0700
Subject: [PATCH 1/3] Test against Rails 5 and 6

---
 .travis.yml   | 6 +++++-
 Gemfile       | 8 ++------
 riiif.gemspec | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd20622..ac64449 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,11 @@ before_install:
   - gem update --system
 
 rvm:
-  - 2.4.0
+  - 2.6.3
+
+env:
+ - "RAILS_VERSION=5.2.3"
+ - "RAILS_VERSION=6.0.0"
 
 sudo: false
 language: ruby
diff --git a/Gemfile b/Gemfile
index a994fc3..552ce19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,12 +29,8 @@ else
   end
 
   case ENV['RAILS_VERSION']
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
+  when /^5\./
+    gem 'sass-rails', '~> 5.0'
   end
 end
 # END ENGINE_CART BLOCK
diff --git a/riiif.gemspec b/riiif.gemspec
index 57facb0..c22039b 100644
--- a/riiif.gemspec
+++ b/riiif.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'railties', '>= 4.2', '<6'
+  spec.add_dependency 'railties', '>= 4.2', '<7'
   spec.add_dependency 'deprecation', '>= 1.0.0'
   spec.add_dependency 'iiif-image-api', '~> 0.1.0'
   spec.add_development_dependency 'bundler'

From a5412a53558f2f19f609ddcd09e2d27fc3f188e0 Mon Sep 17 00:00:00 2001
From: Chris Beer <cabeer@stanford.edu>
Date: Thu, 31 Oct 2019 10:56:12 -0700
Subject: [PATCH 2/3] Try pinning travis to trusty

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ac64449..8465265 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,3 +13,4 @@ env:
 
 sudo: false
 language: ruby
+dist: trusty

From 7ec63cd4bea5347485178bd7e1d7683029253767 Mon Sep 17 00:00:00 2001
From: Chris Beer <cabeer@stanford.edu>
Date: Thu, 31 Oct 2019 11:10:05 -0700
Subject: [PATCH 3/3] Pin to sass-rails 5 for now

---
 Gemfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 552ce19..59d0913 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,9 +28,6 @@ else
     end
   end
 
-  case ENV['RAILS_VERSION']
-  when /^5\./
-    gem 'sass-rails', '~> 5.0'
-  end
+  gem 'sass-rails', '~> 5.0'
 end
 # END ENGINE_CART BLOCK