Fix tests

johnnyshields · johnnyshields · commit 356e6d1fe34e · 2023-03-07T09:20:54.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Ruby SAML Changelog
+
 ### 1.15.0 (Jan 04, 2023)
 * [#650](https://github.com/SAML-Toolkits/ruby-saml/pull/650) Replace strip! by strip on compute_digest method
 * [#638](https://github.com/SAML-Toolkits/ruby-saml/pull/638) Fix dateTime format for the validUntil attribute of the generated metadata 
diff --git a/Gemfile b/Gemfile
@@ -1,15 +1,13 @@
-#
 # Please keep this file alphabetized and organized
 #
 source 'https://rubygems.org'
 
 gemspec
 
-gem 'minitest', '~> 5.5'
-gem 'mocha', '~> 0.14'
-gem 'rake', '>= 12.3.3'
-gem 'shoulda', '~> 2.11'
-gem 'simplecov', '< 0.22.0'
-gem 'simplecov-lcov', '> 0.7.0'
-gem 'systemu', '~> 2'
-gem 'timecop', '~> 0.9'
+gem 'minitest', '~> 5.18', require: false
+gem 'mocha', '~> 2.0', require: false
+gem 'rake', '~> 13.0'
+gem 'simplecov', '~> 0.22', require: false
+gem 'simplecov-lcov', '~> 0.8', require: false
+gem 'systemu', '~> 2.6', require: false
+gem 'timecop', '~> 0.9', require: false
diff --git a/test/attributes_test.rb b/test/attributes_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/attributes'
 
diff --git a/test/idp_metadata_parser_test.rb b/test/idp_metadata_parser_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/idp_metadata_parser'
 
diff --git a/test/logging_test.rb b/test/logging_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/logging'
 
diff --git a/test/logoutrequest_test.rb b/test/logoutrequest_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/logoutrequest'
 
diff --git a/test/logoutresponse_test.rb b/test/logoutresponse_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/logoutresponse'
 require 'logout_responses/logoutresponse_fixtures'
diff --git a/test/metadata_test.rb b/test/metadata_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/metadata'
 
diff --git a/test/request_test.rb b/test/request_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/authrequest'
 require 'onelogin/ruby-saml/setting_error'
diff --git a/test/response_test.rb b/test/response_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/response'
 
diff --git a/test/saml_message_test.rb b/test/saml_message_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 class RubySamlTest < Minitest::Test
 
diff --git a/test/settings_test.rb b/test/settings_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/settings'
 require 'onelogin/ruby-saml/validation_error'
diff --git a/test/slo_logoutrequest_test.rb b/test/slo_logoutrequest_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 require 'logout_responses/logoutresponse_fixtures'
 
 require 'onelogin/ruby-saml/slo_logoutrequest'
diff --git a/test/slo_logoutresponse_test.rb b/test/slo_logoutresponse_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 require 'onelogin/ruby-saml/slo_logoutresponse'
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -15,7 +15,7 @@
 require 'rubygems'
 require 'bundler'
 require 'minitest/autorun'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'timecop'
 
 Bundler.require :default, :test
diff --git a/test/utils_test.rb b/test/utils_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 
 class UtilsTest < Minitest::Test
   describe ".parse_duration" do
diff --git a/test/xml_security_test.rb b/test/xml_security_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require_relative 'test_helper'
 require 'xml_security'
 
 class XmlSecurityTest < Minitest::Test

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# Ruby SAML Changelog`
	`2`	`+`
`2`	`3`	`### 1.15.0 (Jan 04, 2023)`
`3`	`4`	`* [#650](https://github.com/SAML-Toolkits/ruby-saml/pull/650) Replace strip! by strip on compute_digest method`
`4`	`5`	`* [#638](https://github.com/SAML-Toolkits/ruby-saml/pull/638) Fix dateTime format for the validUntil attribute of the generated metadata`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))`
	`1`	`+require_relative 'test_helper'`
`2`	`2`
`3`	`3`	`require 'onelogin/ruby-saml/attributes'`
`4`	`4`