testing

Author: j-castellanos

Gemfile

@@ -8,7 +8,7 @@ gem 'ruby-saml', git: 'https://github.com/SAML-Toolkits/ruby-saml.git', branch:
 group :test do
   gem 'rake'
   gem 'rspec', '~> 3.0'
-  gem 'rails', '~> 8.0.0'
+  gem 'rails', '~> 7.1'
   gem 'rspec-rails'
   gem 'sqlite3', '~> 2.6.0'
   gem 'capybara'

lib/devise_saml_authenticatable.rb

@@ -20,6 +20,10 @@ class Engine < Rails::Engine
   end
 end
 
+if !defined?(::RubySaml) && defined?(::OneLogin::RubySaml)
+  ::RubySaml = ::OneLogin::RubySaml
+end
+
 # Get saml information from config/saml.yml now
 module Devise
   # Allow route customization to avoid collision

spec/support/Gemfile.rails7.1

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in devise_saml_authenticatable.gemspec
 gemspec path: '../..'
 
+gem 'ruby-saml', git: 'https://github.com/SAML-Toolkits/ruby-saml.git', branch: 'v2.x'
+
 group :test do
   gem 'rake'
   gem 'rspec', '~> 3.0'

spec/support/Gemfile.rails7.2

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in devise_saml_authenticatable.gemspec
 gemspec path: '../..'
 
+gem 'ruby-saml', git: 'https://github.com/SAML-Toolkits/ruby-saml.git', branch: 'v2.x'
+
 group :test do
   gem 'rake'
   gem 'rspec', '~> 3.0'

spec/support/Gemfile.rails8.0

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in devise_saml_authenticatable.gemspec
 gemspec path: '../..'
 
+gem 'ruby-saml', git: 'https://github.com/SAML-Toolkits/ruby-saml.git', branch: 'v2.x'
+
 group :test do
   gem 'rake'
   gem 'rspec', '~> 3.0'

spec/support/rails_app.rb

@@ -4,6 +4,7 @@
 require "timeout"
 require "bundler/setup"
 require "bundler/gem_tasks"
+require "ruby-saml"
 
 APP_READY_TIMEOUT ||= 30
 

spec/support/sp_template.rb

@@ -1,17 +1,15 @@
 # Set up a SAML Service Provider
 
-require "ruby-saml/version"
-
 attribute_map_resolver = ENV.fetch("ATTRIBUTE_MAP_RESOLVER", "nil")
 saml_session_index_key = ENV.fetch('SAML_SESSION_INDEX_KEY', ":session_index")
 use_subject_to_authenticate = ENV.fetch('USE_SUBJECT_TO_AUTHENTICATE')
 idp_settings_adapter = ENV.fetch('IDP_SETTINGS_ADAPTER', "nil")
 idp_entity_id_reader = ENV.fetch('IDP_ENTITY_ID_READER', '"DeviseSamlAuthenticatable::DefaultIdpEntityIdReader"')
 saml_failed_callback = ENV.fetch('SAML_FAILED_CALLBACK', "nil")
-ruby_saml_version = ENV.fetch("RUBY_SAML_VERSION")
+ruby_saml_version = ENV.fetch("RUBY_SAML_VERSION", "2.0.0")
 
 gem 'devise_saml_authenticatable', path: File.expand_path("../../..", __FILE__)
-gem 'ruby-saml', ruby_saml_version
+gem 'ruby-saml', git: 'https://github.com/SAML-Toolkits/ruby-saml.git', branch: 'v2.x'
 gem 'net-smtp', require: false
 gem 'net-imap', require: false
 gem 'net-pop', require: false