Add Rails 6 testing (#161)

- Continue to support Rails 4

Author: adamstegman

.travis.yml

@@ -4,11 +4,13 @@ rvm:
   - "2.1.10"
   - "2.2.10"
   - "2.3.8"
-  - "2.4.6"
-  - "2.5.5"
-  - "2.6.3"
+  - "2.4.9"
+  - "2.5.7"
+  - "2.6.5"
+  - "2.7.0"
 gemfile:
   - Gemfile
+  - spec/support/Gemfile.rails5.2
   - spec/support/Gemfile.rails5.1
   - spec/support/Gemfile.rails5
   - spec/support/Gemfile.rails4
@@ -20,16 +22,28 @@ matrix:
       gemfile: spec/support/Gemfile.rails5
     - rvm: "2.0.0"
       gemfile: spec/support/Gemfile.rails5.1
+    - rvm: "2.0.0"
+      gemfile: spec/support/Gemfile.rails5.2
     - rvm: "2.1.10"
       gemfile: Gemfile
     - rvm: "2.1.10"
       gemfile: spec/support/Gemfile.rails5
     - rvm: "2.1.10"
       gemfile: spec/support/Gemfile.rails5.1
+    - rvm: "2.1.10"
+      gemfile: spec/support/Gemfile.rails5.2
+    - rvm: "2.2.10"
+      gemfile: Gemfile
     - rvm: "2.2.10"
+      gemfile: spec/support/Gemfile.rails5.2
+    - rvm: "2.3.8"
+      gemfile: Gemfile
+    - rvm: "2.4.9"
       gemfile: Gemfile
     - rvm: "2.6.3"
       gemfile: spec/support/Gemfile.rails4
+    - rvm: "2.7.0"
+      gemfile: spec/support/Gemfile.rails4
 
 before_install:
   - command -v bundle || gem install bundler -v '~> 1.17.3'

Gemfile

@@ -6,9 +6,9 @@ gemspec
 group :test do
   gem 'rake'
   gem 'rspec', '~> 3.0'
-  gem 'rails', '~> 5.2'
+  gem 'rails', '~> 6.0'
   gem 'rspec-rails'
-  gem 'sqlite3', '~> 1.3.6'
+  gem 'sqlite3', '~> 1.4.0'
   gem 'capybara'
   gem 'poltergeist'
 

spec/controllers/devise/saml_sessions_controller_spec.rb

@@ -1,19 +1,24 @@
 require 'rails_helper'
 
-class Devise::SessionsController < ActionController::Base
+# The important parts from devise
+class DeviseController < ApplicationController
   attr_accessor :current_user
 
-  # The important parts from devise
   def resource_class
     User
   end
 
+  def require_no_authentication
+  end
+end
+class Devise::SessionsController < DeviseController
   def destroy
     sign_out
     redirect_to after_sign_out_path_for(:user)
   end
 
-  def require_no_authentication
+  def verify_signed_out_user
+    # no-op for these tests
   end
 end
 
@@ -23,6 +28,7 @@ def require_no_authentication
   let(:idp_providers_adapter) { spy("Stub IDPSettings Adaptor") }
 
   before do
+    @request.env["devise.mapping"] = Devise.mappings[:user]
     allow(idp_providers_adapter).to receive(:settings).and_return({
       assertion_consumer_service_url: "acs_url",
       assertion_consumer_service_binding: "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
@@ -36,6 +42,20 @@ def require_no_authentication
     })
   end
 
+  before do
+    if Rails::VERSION::MAJOR < 5 && Gem::Version.new(RUBY_VERSION) > Gem::Version.new("2.6")
+      # we still want to support Rails 4
+      # patch tests using snippet from https://github.com/rails/rails/issues/34790#issuecomment-483607370
+      class ActionController::TestResponse < ActionDispatch::TestResponse
+        def recycle!
+          @mon_mutex_owner_object_id = nil
+          @mon_mutex = nil
+          initialize
+        end
+      end
+    end
+  end
+
   describe '#new' do
     let(:saml_response) { File.read(File.join(File.dirname(__FILE__), '../../support', 'response_encrypted_nameid.xml.base64')) }
 

spec/support/Gemfile.rails5.2

@@ -0,0 +1,19 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in devise_saml_authenticatable.gemspec
+gemspec path: '../..'
+
+group :test do
+  gem 'rake'
+  gem 'rspec', '~> 3.0'
+  gem 'rails', '~> 5.2'
+  gem 'rspec-rails'
+  gem 'sqlite3', '~> 1.3.6'
+  gem 'capybara'
+  gem 'poltergeist'
+
+  # Lock down versions of gems for older versions of Ruby
+  if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("2.4")
+    gem 'responders', '~> 2.4'
+  end
+end

spec/support/sp_template.rb

@@ -27,8 +27,10 @@
 end
   GEMFILE
 }
-# sqlite3 is hard-coded in Rails to v1.3.x
-gsub_file 'Gemfile', /^gem 'sqlite3'.*$/, "gem 'sqlite3', '~> 1.3.6'"
+if Rails::VERSION::MAJOR < 6
+  # sqlite3 is hard-coded in Rails < 6 to v1.3.x
+  gsub_file 'Gemfile', /^gem 'sqlite3'.*$/, "gem 'sqlite3', '~> 1.3.6'"
+end
 
 template File.expand_path('../idp_settings_adapter.rb.erb', __FILE__), 'app/lib/idp_settings_adapter.rb'
 
@@ -107,7 +109,12 @@ def self.entity_id(params)
 end
   CONFIG
 
-  generate :devise, "user", "email:string", "name:string", "session_index:string"
+  if Rails::VERSION::MAJOR < 6
+    generate :devise, "user", "email:string", "name:string", "session_index:string"
+  else
+    # devise seems to add `email` by default in Rails 6
+    generate :devise, "user", "name:string", "session_index:string"
+  end
   gsub_file 'app/models/user.rb', /database_authenticatable.*\n.*/, 'saml_authenticatable'
   route "resources :users, only: [:create]"
   create_file('app/controllers/users_controller.rb', <<-USERS)