devise_saml_authenticatable 1.9.0 → 2.0.0

data/spec/devise_saml_authenticatable/model_spec.rb

@@ -20,7 +20,7 @@ describe Devise::Models::SamlAuthenticatable do
 
     # Fake out ActiveRecord and Devise API to satisfy verifiable mocks
     class << self
-      def where(*args); end
+      def find_by(*args); end
       def logger; end
     end
   end
@@ -64,12 +64,12 @@ describe Devise::Models::SamlAuthenticatable do
 
   it "looks up the user by the configured default user key" do
     user = Model.new(new_record: false)
-    expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+    expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
     expect(Model.authenticate_with_saml(response, nil)).to eq(user)
   end
 
   it "returns nil if it cannot find a user" do
-    expect(Model).to receive(:where).with(email: 'user@example.com').and_return([])
+    expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(nil)
     expect(Model.authenticate_with_saml(response, nil)).to be_nil
   end
 
@@ -83,12 +83,12 @@ describe Devise::Models::SamlAuthenticatable do
 
     it "looks up the user by the configured default user key" do
       user = Model.new(new_record: false)
-      expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+      expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
       expect(Model.authenticate_with_saml(response, nil)).to eq(user)
     end
 
     it "returns nil if it cannot find a user" do
-      expect(Model).to receive(:where).with(email: 'user@example.com').and_return([])
+      expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(nil)
       expect(Model.authenticate_with_saml(response, nil)).to be_nil
     end
 
@@ -98,7 +98,7 @@ describe Devise::Models::SamlAuthenticatable do
       end
 
       it "creates and returns a new user with the name identifier and given attributes" do
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(nil)
         model = Model.authenticate_with_saml(response, nil)
         expect(model.email).to eq('user@example.com')
         expect(model.name).to  eq('A User')
@@ -114,7 +114,7 @@ describe Devise::Models::SamlAuthenticatable do
 
       context "when the proc returns true" do
         it "creates and returns a new user with the name identifier and given attributes" do
-          expect(Model).to receive(:where).with(email: name_id).and_return([])
+          expect(Model).to receive(:find_by).with({ email: name_id }).and_return(nil)
           model = Model.authenticate_with_saml(response, nil)
           expect(model.email).to eq('user@example.com')
           expect(model.name).to  eq('A User')
@@ -126,7 +126,7 @@ describe Devise::Models::SamlAuthenticatable do
         let(:name_id) { 'do_not_create@example.com' }
 
         it "does not creates new user" do
-          expect(Model).to receive(:where).with(email: name_id).and_return([])
+          expect(Model).to receive(:find_by).with({ email: name_id }).and_return(nil)
           expect(Model.authenticate_with_saml(response, nil)).to be_nil
         end
       end
@@ -139,7 +139,7 @@ describe Devise::Models::SamlAuthenticatable do
 
       it "creates and returns a new user with the name identifier and given attributes" do
         user = Model.new(email: "old_mail@mail.com", name: "old name", new_record: false)
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
         model = Model.authenticate_with_saml(response, nil)
         expect(model.email).to eq('user@example.com')
         expect(model.name).to  eq('A User')
@@ -157,7 +157,7 @@ describe Devise::Models::SamlAuthenticatable do
 
       context "when the proc returns true" do
         it "updates user with given attributes" do
-          expect(Model).to receive(:where).with(email: name_id).and_return([user])
+          expect(Model).to receive(:find_by).with({ email: name_id }).and_return(user)
           model = Model.authenticate_with_saml(response, nil)
           expect(model.email).to eq('user@example.com')
           expect(model.name).to  eq('A User')
@@ -169,7 +169,7 @@ describe Devise::Models::SamlAuthenticatable do
         let(:name_id) { 'do_not_update@example.com' }
 
         it "does not update user" do
-          expect(Model).to receive(:where).with(email: name_id).and_return([user])
+          expect(Model).to receive(:find_by).with({ email: name_id }).and_return(user)
           model = Model.authenticate_with_saml(response, nil)
           expect(model.email).to eq('old_mail@mail.com')
           expect(model.name).to  eq('old name')
@@ -185,7 +185,7 @@ describe Devise::Models::SamlAuthenticatable do
     end
 
     it "creates and returns a new user with the given attributes" do
-      expect(Model).to receive(:where).with(email: 'user@example.com').and_return([])
+      expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(nil)
       model = Model.authenticate_with_saml(response, nil)
       expect(model.email).to eq('user@example.com')
       expect(model.name).to  eq('A User')
@@ -204,7 +204,7 @@ describe Devise::Models::SamlAuthenticatable do
       let(:response) { double(:response, issuers: ['to_create_idp'], attributes: attributes, name_id: name_id) }
 
       it "creates and returns a new user with the name identifier and given attributes" do
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(nil)
         model = Model.authenticate_with_saml(response, nil)
         expect(model.email).to eq('user@example.com')
         expect(model.name).to  eq('A User')
@@ -216,7 +216,7 @@ describe Devise::Models::SamlAuthenticatable do
       let(:response) { double(:response, issuers: ['do_not_create_idp'], attributes: attributes, name_id: name_id) }
 
       it "does not creates new user" do
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(nil)
         expect(Model.authenticate_with_saml(response, nil)).to be_nil
       end
     end
@@ -228,13 +228,13 @@ describe Devise::Models::SamlAuthenticatable do
     end
 
     it "returns nil if the user is not found" do
-      expect(Model).to receive(:where).with(email: 'user@example.com').and_return([])
+      expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(nil)
       expect(Model.authenticate_with_saml(response, nil)).to be_nil
     end
 
     it "updates the attributes if the user is found" do
       user = Model.new(email: "old_mail@mail.com", name: "old name", new_record: false)
-      expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+      expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
       model = Model.authenticate_with_saml(response, nil)
       expect(model.email).to eq('user@example.com')
       expect(model.name).to  eq('A User')
@@ -254,7 +254,7 @@ describe Devise::Models::SamlAuthenticatable do
       let(:response) { double(:response, issuers: ['to_update_idp'], attributes: attributes, name_id: name_id) }
 
       it "updates user with given attributes" do
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
         model = Model.authenticate_with_saml(response, nil)
         expect(model.email).to eq('user@example.com')
         expect(model.name).to  eq('A User')
@@ -266,7 +266,7 @@ describe Devise::Models::SamlAuthenticatable do
       let(:response) { double(:response, issuers: ['do_not_update_idp'], attributes: attributes, name_id: name_id) }
 
       it "does not update user" do
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
         model = Model.authenticate_with_saml(response, nil)
         expect(model.email).to eq('old_mail@mail.com')
         expect(model.name).to  eq('old name')
@@ -282,7 +282,7 @@ describe Devise::Models::SamlAuthenticatable do
 
       it "looks up the user with a downcased value" do
         user = Model.new(new_record: false)
-        expect(Model).to receive(:where).with(email: 'upper@example.com').and_return([user])
+        expect(Model).to receive(:find_by).with({ email: 'upper@example.com' }).and_return(user)
         expect(Model.authenticate_with_saml(response, nil)).to eq(user)
       end
     end
@@ -320,7 +320,7 @@ describe Devise::Models::SamlAuthenticatable do
       end
 
       it "returns the user" do
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
         expect(Model.authenticate_with_saml(response, nil)).to eq(user)
       end
     end
@@ -331,7 +331,7 @@ describe Devise::Models::SamlAuthenticatable do
       end
 
       it "returns nil" do
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
         expect(Model.authenticate_with_saml(response, nil)).to be_nil
       end
     end
@@ -354,7 +354,7 @@ describe Devise::Models::SamlAuthenticatable do
       end
 
       it "returns the user" do
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
         expect(Model.authenticate_with_saml(response, nil)).to eq(user)
       end
     end
@@ -365,7 +365,7 @@ describe Devise::Models::SamlAuthenticatable do
       end
 
       it "returns nil" do
-        expect(Model).to receive(:where).with(email: 'user@example.com').and_return([user])
+        expect(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(user)
         expect(Model.authenticate_with_saml(response, nil)).to be_nil
       end
     end
@@ -412,7 +412,7 @@ describe Devise::Models::SamlAuthenticatable do
     end
 
     def configure_hook(&block)
-      allow(Model).to receive(:where).with(email: 'user@example.com').and_return([])
+      allow(Model).to receive(:find_by).with({ email: 'user@example.com' }).and_return(nil)
       allow(Devise).to receive(:saml_default_user_key).and_return(:email)
       allow(Devise).to receive(:saml_create_user).and_return(true)
       allow(Devise).to receive(:saml_update_resource_hook).and_return(block)
@@ -423,7 +423,7 @@ describe Devise::Models::SamlAuthenticatable do
     let(:name_id) { 'SomeUsername' }
 
     it "can replicate the default behaviour for a new user in a custom locator" do
-      allow(Model).to receive(:where).with(email: attributes['saml-email-format']).and_return([])
+      allow(Model).to receive(:find_by).with({ email: attributes['saml-email-format'] }).and_return(nil)
 
       configure_hook do |model, saml_response, auth_value|
         Devise.saml_default_resource_locator.call(model, saml_response, auth_value)
@@ -439,7 +439,7 @@ describe Devise::Models::SamlAuthenticatable do
       user = Model.new(email: attributes['saml-email-format'], name: attributes['saml-name-format'])
       user.save!
 
-      allow(Model).to receive(:where).with(email: attributes['saml-email-format']).and_return([user])
+      allow(Model).to receive(:find_by).with({ email: attributes['saml-email-format'] }).and_return(user)
 
       configure_hook do |model, saml_response, auth_value|
         Devise.saml_default_resource_locator.call(model, saml_response, auth_value)
@@ -453,11 +453,11 @@ describe Devise::Models::SamlAuthenticatable do
     end
 
     it "can change the default behaviour for a new user from the saml response" do
-      allow(Model).to receive(:where).with(foo: attributes['saml-email-format'], bar: name_id).and_return([])
+      allow(Model).to receive(:find_by).with({ foo: attributes['saml-email-format'], bar: name_id }).and_return(nil)
 
       configure_hook do |model, saml_response, auth_value|
         name_id = saml_response.raw_response.name_id
-        model.where(foo: auth_value, bar: name_id).first
+        model.find_by(foo: auth_value, bar: name_id)
       end
 
       new_user = Model.authenticate_with_saml(response, nil)
@@ -470,11 +470,11 @@ describe Devise::Models::SamlAuthenticatable do
       user = Model.new(email: attributes['saml-email-format'], name: attributes['saml-name-format'])
       user.save!
 
-      allow(Model).to receive(:where).with(foo: attributes['saml-email-format'], bar: name_id).and_return([user])
+      allow(Model).to receive(:find_by).with({ foo: attributes['saml-email-format'], bar: name_id }).and_return(user)
 
       configure_hook do |model, saml_response, auth_value|
         name_id = saml_response.raw_response.name_id
-        model.where(foo: auth_value, bar: name_id).first
+        model.find_by(foo: auth_value, bar: name_id)
       end
 
       new_user = Model.authenticate_with_saml(response, nil)

data/spec/devise_saml_authenticatable/saml_config_spec.rb

@@ -10,7 +10,7 @@ describe DeviseSamlAuthenticatable::SamlConfig do
   context "when config/idp.yml does not exist" do
     before do
       allow(Rails).to receive(:root).and_return("/railsroot")
-      allow(File).to receive(:exists?).with("/railsroot/config/idp.yml").and_return(false)
+      allow(File).to receive(:exist?).with("/railsroot/config/idp.yml").and_return(false)
     end
 
     it "is the global devise SAML config" do
@@ -33,13 +33,13 @@ describe DeviseSamlAuthenticatable::SamlConfig do
 
           def self.settings(idp_entity_id)
             #some hash of stuff (by doing a fetch, in our case, but could also be a giant hash keyed by idp_entity_id)
-            if idp_entity_id == "http://www.example.com"
+            if idp_entity_id == "https://www.example.com"
               base = {
                 assertion_consumer_service_url: "acs_url",
                 assertion_consumer_service_binding: "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
                 name_identifier_format: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress",
-                issuer: "sp_issuer",
-                idp_entity_id: "http://www.example.com",
+                sp_entity_id: "sp_issuer",
+                idp_entity_id: "https://www.example.com",
                 authn_context: "",
                 idp_cert: "idp_cert"
               }
@@ -55,13 +55,13 @@ describe DeviseSamlAuthenticatable::SamlConfig do
                 )
               })
               base
-            elsif idp_entity_id == "http://www.example.com_other"
+            elsif idp_entity_id == "https://www.example.com_other"
               base = {
                 assertion_consumer_service_url: "acs_url_other",
                 assertion_consumer_service_binding: "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST_other",
                 name_identifier_format: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress_other",
-                issuer: "sp_issuer_other",
-                idp_entity_id: "http://www.example.com_other",
+                sp_entity_id: "sp_issuer_other",
+                idp_entity_id: "https://www.example.com_other",
                 authn_context: "_other",
                 idp_cert: "idp_cert_other"
               }
@@ -85,7 +85,7 @@ describe DeviseSamlAuthenticatable::SamlConfig do
       }
 
       context "when a specific idp_entity_id is requested" do
-        let(:idp_entity_id) { "http://www.example.com" }
+        let(:idp_entity_id) { "https://www.example.com" }
         it "uses the settings from the adapter for that idp" do
           expect(saml_config.idp_entity_id).to eq (idp_entity_id)
           with_ruby_saml_1_12_or_greater(proc {
@@ -98,7 +98,7 @@ describe DeviseSamlAuthenticatable::SamlConfig do
       end
 
       context "when another idp_entity_id is requested" do
-        let(:idp_entity_id) { "http://www.example.com_other" }
+        let(:idp_entity_id) { "https://www.example.com_other" }
         it "returns the other idp settings" do
           expect(saml_config.idp_entity_id).to eq (idp_entity_id)
           with_ruby_saml_1_12_or_greater(proc {
@@ -134,7 +134,7 @@ environment:
   idp_cert_fingerprint: idp_cert_fingerprint
   idp_cert_fingerprint_algorithm: idp_cert_fingerprint_algorithm
   idp_entity_id: idp_entity_id
-  issuer: issuer
+  sp_entity_id: issuer
   name_identifier_format: name_identifier_format
   name_identifier_value: name_identifier_value
   passive: passive
@@ -156,7 +156,7 @@ TARGET_URLS
     before do
       allow(Rails).to receive(:env).and_return("environment")
       allow(Rails).to receive(:root).and_return("/railsroot")
-      allow(File).to receive(:exists?).with("/railsroot/config/idp.yml").and_return(true)
+      allow(File).to receive(:exist?).with("/railsroot/config/idp.yml").and_return(true)
       allow(File).to receive(:read).with("/railsroot/config/idp.yml").and_return(idp_yaml)
     end
 
@@ -185,7 +185,7 @@ TARGET_URLS
         expect(saml_config.idp_slo_target_url).to eq('idp_slo_service_url')
         expect(saml_config.idp_sso_target_url).to eq('idp_sso_service_url')
       })
-      expect(saml_config.issuer).to eq('issuer')
+      expect(saml_config.sp_entity_id).to eq('issuer')
       expect(saml_config.name_identifier_format).to eq('name_identifier_format')
       expect(saml_config.name_identifier_value).to eq('name_identifier_value')
       expect(saml_config.passive).to eq('passive')

data/spec/devise_saml_authenticatable/strategy_spec.rb

@@ -23,8 +23,10 @@ describe Devise::Strategies::SamlAuthenticatable do
   end
 
   let(:params) { {} }
+  let(:session) { {} }
   before do
     allow(strategy).to receive(:params).and_return(params)
+    allow_any_instance_of(ActionDispatch::Request).to receive(:session).and_return(session)
   end
 
   context "with a login SAMLResponse parameter" do
@@ -37,10 +39,25 @@ describe Devise::Strategies::SamlAuthenticatable do
     it "authenticates with the response" do
       expect(OneLogin::RubySaml::Response).to receive(:new).with(params[:SAMLResponse], anything)
       expect(user_class).to receive(:authenticate_with_saml).with(response, nil)
-      expect(user).to receive(:after_saml_authentication).with(response.sessionindex)
 
       expect(strategy).to receive(:success!).with(user)
       strategy.authenticate!
+      expect(session).to eq(Devise.saml_session_index_key => response.sessionindex)
+    end
+
+    context "when saml_session_index_key is not configured" do
+      before do
+        Devise.saml_session_index_key = nil
+      end
+
+      it "authenticates with the response" do
+        expect(OneLogin::RubySaml::Response).to receive(:new).with(params[:SAMLResponse], anything)
+        expect(user_class).to receive(:authenticate_with_saml).with(response, nil)
+
+        expect(strategy).to receive(:success!).with(user)
+        strategy.authenticate!
+        expect(session).to eq({})
+      end
     end
 
     context "and a RelayState parameter" do
@@ -61,8 +78,8 @@ describe Devise::Strategies::SamlAuthenticatable do
               assertion_consumer_service_url: "acs url",
               assertion_consumer_service_binding: "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
               name_identifier_format: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress",
-              issuer: "sp_issuer",
-              idp_entity_id: "http://www.example.com",
+              sp_entity_id: "sp_issuer",
+              idp_entity_id: "https://www.example.com",
               authn_context: "",
               idp_cert: "idp_cert"
             }
@@ -95,10 +112,10 @@ describe Devise::Strategies::SamlAuthenticatable do
         expect(OneLogin::RubySaml::Response).to receive(:new).with(params[:SAMLResponse], anything)
         expect(idp_providers_adapter).to receive(:settings).with(idp_entity_id, anything)
         expect(user_class).to receive(:authenticate_with_saml).with(response, params[:RelayState])
-        expect(user).to receive(:after_saml_authentication).with(response.sessionindex)
 
         expect(strategy).to receive(:success!).with(user)
         strategy.authenticate!
+        expect(session).to eq(Devise.saml_session_index_key => response.sessionindex)
       end
     end
 
@@ -173,7 +190,6 @@ describe Devise::Strategies::SamlAuthenticatable do
 
       before do
         allow(Devise).to receive(:saml_validate_in_response_to).and_return(true)
-        allow_any_instance_of(ActionDispatch::Request).to receive(:session).and_return(session)
       end
 
       context "when the session has a saml_transaction_id" do
@@ -193,8 +209,6 @@ describe Devise::Strategies::SamlAuthenticatable do
       end
 
       context "when the session is missing a saml_transaction_id" do
-        let(:session) { { } }
-
         it "uses 'ID_MISSING' for matches_request_id so validation will fail" do
           expect(OneLogin::RubySaml::Response).to receive(:new).with(params[:SAMLResponse], hash_including(matches_request_id: "ID_MISSING"))
           strategy.authenticate!

data/spec/features/saml_authentication_spec.rb

@@ -10,11 +10,18 @@ Capybara.register_driver :chrome do |app|
   options.add_argument('--headless')
   options.add_argument('--allow-insecure-localhost')
   options.add_argument('--ignore-certificate-errors')
+  # Headless Chrome 134 is failing randomly - optimizing here to try and avoid it
+  options.add_argument('--disable-background-timer-throttling')
+  options.add_argument('--disable-backgrounding-occluded-windows')
+  options.add_argument('--disable-renderer-backgrounding')
+  options.add_argument('--no-sandbox')
+  options.add_argument('--password-store=basic');
+  options.add_argument('--suppress-message-center-popups');
 
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
-    capabilities: [options]
+    options: options,
   )
 end
 Capybara.default_driver = :chrome
@@ -202,7 +209,7 @@ describe "SAML Authentication", type: :feature do
         fill_in "Password", with: "asdf"
         click_on "Sign in"
         expect(page).to have_content(:all, "Example Domain This domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission.")
-        expect(current_url).to eq("http://www.example.com/")
+        expect(current_url).to eq("https://www.example.com/")
       end
     end
   end

data/spec/rails_helper.rb

@@ -6,12 +6,25 @@ create_app('sp', 'USE_SUBJECT_TO_AUTHENTICATE' => "false")
 require "#{working_directory}/sp/config/environment"
 require 'rspec/rails'
 
+# Starting from Rails 8.0, routes are lazy-loaded by default in test and development environments.
+# However, Devise's mappings are built during the routes loading phase.
+# To ensure it works correctly, we need to load the routes first before accessing @@mappings.
+if defined?(Rails) && Gem::Version.new(Rails.version) > Gem::Version.new('7.2')
+  require 'devise'
+  module Devise
+    def self.mappings
+      Rails.application.try(:reload_routes_unless_loaded)
+      @@mappings
+    end
+  end
+end
+
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 if ActiveRecord::Base.connection.respond_to?(:migration_context)
   ActiveRecord::Base.connection.migration_context.migrate
 else
-  ActiveRecord::Migrator.migrate("#{working_directory}/sp/db/migrate/")
+  ActiveRecord::MigrationContext.new("#{working_directory}/sp/db/migrate/").migrate
 end
 
 RSpec.configure do |config|

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
 require "fileutils"
+require 'capybara/rspec'
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
+  # Specify a longer timeout for Capybara to allow for slower CI environments causing failing tests
+  Capybara.default_max_wait_time = 10 #
 
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
@@ -37,6 +40,6 @@ RSpec.configure do |config|
 end
 
 require 'support/rails_app'
-
+require 'logger'
 require "action_controller" # https://github.com/heartcombo/responders/pull/95
 require 'devise_saml_authenticatable'

data/spec/support/{Gemfile.rails5.2 → Gemfile.rails7.1}

@@ -6,9 +6,13 @@ gemspec path: '../..'
 group :test do
   gem 'rake'
   gem 'rspec', '~> 3.0'
-  gem 'rails', '~> 5.2.0'
-  gem 'rspec-rails', '~> 3.9'
-  gem 'sqlite3', '~> 1.3.6'
+  gem 'rails', '~> 7.1.0'
+  gem 'rspec-rails', '~> 7.1'
+  gem 'sqlite3', '~> 2.6.0'
   gem 'capybara'
   gem 'selenium-webdriver'
+  gem 'webrick'
+  gem 'net-smtp', require: false
+  gem 'net-imap', require: false
+  gem 'net-pop', require: false
 end

data/spec/support/{Gemfile.rails6 → Gemfile.rails7.2}

@@ -6,13 +6,13 @@ gemspec path: '../..'
 group :test do
   gem 'rake'
   gem 'rspec', '~> 3.0'
-  gem 'rails', '~> 6.0.0'
-  gem 'rspec-rails', '~> 5.0'
-  gem 'sqlite3', '~> 1.4.0'
+  gem 'rails', '~> 7.2.0'
+  gem 'rspec-rails', '~> 7.1'
+  gem 'sqlite3', '~> 2.6.0'
   gem 'capybara'
   gem 'selenium-webdriver'
-
-  if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("3.0")
-    gem 'webrick'
-  end
+  gem 'webrick'
+  gem 'net-smtp', require: false
+  gem 'net-imap', require: false
+  gem 'net-pop', require: false
 end

data/spec/support/Gemfile.rails8.0

@@ -0,0 +1,18 @@
+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', '~> 8.0.0'
+  gem 'rspec-rails', '~> 7.1'
+  gem 'sqlite3', '~> 2.6.0'
+  gem 'capybara'
+  gem 'selenium-webdriver'
+  gem 'webrick'
+  gem 'net-smtp', require: false
+  gem 'net-imap', require: false
+  gem 'net-pop', require: false
+end

data/spec/support/idp_settings_adapter.rb.erb

@@ -5,7 +5,7 @@ class IdpSettingsAdapter
         assertion_consumer_service_url: "http://localhost:8020/users/saml/auth",
         assertion_consumer_service_binding: "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
         name_identifier_format: "urn:oasis:names:tc:SAML:2.0:nameid-format:transient",
-        issuer: "sp_issuer",
+        sp_entity_id: "sp_issuer",
         idp_entity_id: "http://localhost:8020/saml/metadata",
         authn_context: "",
         idp_cert_fingerprint: "9E:65:2E:03:06:8D:80:F2:86:C7:6C:77:A1:D9:14:97:0A:4D:F4:4D"

data/spec/support/idp_template.rb

@@ -6,13 +6,9 @@
 @valid_destination = ENV.fetch('VALID_DESTINATION', "true")
 
 gem 'stub_saml_idp'
-gem 'thin'
-
-if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("3.1")
-  gem 'net-smtp', require: false
-  gem 'net-imap', require: false
-  gem 'net-pop', require: false
-end
+gem 'net-smtp', require: false
+gem 'net-imap', require: false
+gem 'net-pop', require: false
 
 route "get '/saml/auth' => 'saml_idp#new'"
 route "post '/saml/auth' => 'saml_idp#create'"

data/spec/support/rails_app.rb

@@ -2,6 +2,8 @@ require "open3"
 require "socket"
 require "tempfile"
 require "timeout"
+require "bundler/setup"
+require "bundler/gem_tasks"
 
 APP_READY_TIMEOUT ||= 30
 
@@ -36,7 +38,7 @@ def start_app(name, port, options = {})
 
   with_clean_env do
     Dir.chdir(app_dir(name)) do
-      pid = Process.spawn(app_env(name), "bundle exec rails server -p #{port} -e production", chdir: app_dir(name), out: "log/#{name}.log", err: "log/#{name}.err.log")
+      pid = Process.spawn(app_env(name), "bundle exec rails server -p #{port} -e test", chdir: app_dir(name), out: "log/#{name}.log", err: "log/#{name}.err.log")
       begin
         Timeout.timeout(APP_READY_TIMEOUT) do
           sleep 1 until app_ready?(pid, port)
@@ -75,9 +77,9 @@ def stop_app(name, pid)
       warn "=== [#{name}] stderr"
       warn File.read("log/#{name}.err.log")
     end
-    if File.exist?("log/production.log")
+    if File.exist?("log/test.log")
       puts "=== [#{name}] Rails logs"
-      puts File.read("log/production.log")
+      puts File.read("log/test.log")
     end
   end
 end
@@ -121,7 +123,7 @@ def app_dir(name)
 end
 
 def app_env(name)
-  {"BUNDLE_GEMFILE" => File.join(app_dir(name), "Gemfile"), "RAILS_ENV" => "production"}
+  {"BUNDLE_GEMFILE" => File.join(app_dir(name), "Gemfile"), "RAILS_ENV" => "test"}
 end
 
 def working_directory