Use minitest instead of test::unit

Author: Lordnibbler

.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
-  - 2.1.1
+  - 2.0.0
+  - 2.1.5
   - ree

Gemfile

@@ -4,24 +4,3 @@
 source 'http://rubygems.org'
 
 gemspec
-
-group :test do
-  if RUBY_VERSION < '1.9'
-    gem 'nokogiri',   '~> 1.5.0'
-    gem 'ruby-debug', '~> 0.10.4'
-  elsif RUBY_VERSION < '2.0'
-    gem 'debugger-linecache', '~> 1.2.0'
-    gem 'debugger', '~> 1.6.4'
-  elsif RUBY_VERSION < '2.1'
-    gem 'byebug',   '~> 2.1.1'
-  else
-    gem 'pry-byebug'
-  end
-
-  gem 'mocha',     '~> 0.14',  :require => false
-  gem 'rake',      '~> 10'
-  gem 'shoulda',   '~> 2.11'
-  gem 'systemu',   '~> 2'
-  gem 'test-unit', '~> 3'
-  gem 'timecop',   '<= 0.6.0'
-end

ruby-saml.gemspec

@@ -21,9 +21,32 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
+  s.required_ruby_version = '>= 1.8.7'
   s.summary = %q{SAML Ruby Tookit}
   s.test_files = `git ls-files test/*`.split("\n")
 
-  s.add_runtime_dependency("uuid", ["~> 2.3"])
-  s.add_runtime_dependency("nokogiri", [">= 1.5.0"])
+  s.add_runtime_dependency('uuid', ['~> 2.3'])
+  s.add_runtime_dependency('nokogiri', ['~> 1.5.0'])
+
+  s.add_development_dependency 'minitest',           ['~> 5.5']
+  s.add_development_dependency 'mocha',              ['~> 0.14']
+  s.add_development_dependency 'rake',               ['~> 10']
+  s.add_development_dependency 'shoulda',            ['~> 2.11']
+  s.add_development_dependency 'systemu',            ['~> 2']
+  s.add_development_dependency 'timecop',            ['<= 0.6.0']
+
+  if RUBY_VERSION < '1.9'
+    # 1.8.7
+    s.add_development_dependency 'ruby-debug', ['~> 0.10.4']
+  elsif RUBY_VERSION < '2.0'
+    # 1.9.x
+    s.add_development_dependency 'debugger-linecache', ['~> 1.2.0']
+    s.add_development_dependency 'debugger', ['~> 1.6.4']
+  elsif RUBY_VERSION < '2.1'
+    # 2.0.x
+    s.add_development_dependency 'byebug',   ['~> 2.1.1']
+  else
+    # 2.1.x, 2.2.x
+    s.add_development_dependency 'pry-byebug'
+  end
 end

test/idp_metadata_parser_test.rb

@@ -2,14 +2,14 @@
 require 'net/http'
 require 'net/https'
 
-class IdpMetadataParserTest < Test::Unit::TestCase
+class IdpMetadataParserTest < Minitest::Test
 
   class MockResponse
     attr_accessor :body
   end
 
-  context "parsing an IdP descriptor file" do
-    should "extract settings details from xml" do
+  describe "parsing an IdP descriptor file" do
+    it "extract settings details from xml" do
       idp_metadata_parser = OneLogin::RubySaml::IdpMetadataParser.new
 
       settings = idp_metadata_parser.parse(idp_metadata)
@@ -20,8 +20,8 @@ class MockResponse
     end
   end
 
-  context "download and parse IdP descriptor file" do
-    setup do
+  describe "download and parse IdP descriptor file" do
+    before do
       mock_response = MockResponse.new
       mock_response.body = idp_metadata
       @url = "https://example.com"
@@ -33,7 +33,7 @@ class MockResponse
     end
 
 
-    should "extract settings from remote xml" do
+    it "extract settings from remote xml" do
       idp_metadata_parser = OneLogin::RubySaml::IdpMetadataParser.new
       settings = idp_metadata_parser.parse_remote(@url)
 
@@ -43,7 +43,7 @@ class MockResponse
       assert_equal OpenSSL::SSL::VERIFY_PEER, @http.verify_mode
     end
 
-    should "accept self signed certificate if insturcted" do
+    it "accept self signed certificate if insturcted" do
       idp_metadata_parser = OneLogin::RubySaml::IdpMetadataParser.new
       settings = idp_metadata_parser.parse_remote(@url, false)
 

test/logoutrequest_test.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
-class RequestTest < Test::Unit::TestCase
+class RequestTest < Minitest::Test
 
-  context "Logoutrequest" do
-    settings = OneLogin::RubySaml::Settings.new
+  describe "Logoutrequest" do
+    let(:settings) { OneLogin::RubySaml::Settings.new }
 
-    should "create the deflated SAMLRequest URL parameter" do
+    it "create the deflated SAMLRequest URL parameter" do
       settings.idp_slo_target_url = "http://unauth.com/logout"
       settings.name_identifier_value = "f00f00"
 
@@ -17,16 +17,16 @@ class RequestTest < Test::Unit::TestCase
       assert_match /^<samlp:LogoutRequest/, inflated
     end
 
-    should "support additional params" do
-
+    it "support additional params" do
+      settings.idp_slo_target_url = "http://example.com"
       unauth_url = OneLogin::RubySaml::Logoutrequest.new.create(settings, { :hello => nil })
       assert unauth_url =~ /&hello=$/
 
       unauth_url = OneLogin::RubySaml::Logoutrequest.new.create(settings, { :foo => "bar" })
       assert unauth_url =~ /&foo=bar$/
     end
 
-    should "set sessionindex" do
+    it "set sessionindex" do
       settings.idp_slo_target_url = "http://example.com"
       sessionidx = UUID.new.generate
       settings.sessionindex = sessionidx
@@ -38,7 +38,7 @@ class RequestTest < Test::Unit::TestCase
       assert_match %r(#{sessionidx}</samlp:SessionIndex>), inflated
     end
 
-    should "set name_identifier_value" do
+    it "set name_identifier_value" do
       settings = OneLogin::RubySaml::Settings.new
       settings.idp_slo_target_url = "http://example.com"
       settings.name_identifier_format = "transient"
@@ -52,8 +52,8 @@ class RequestTest < Test::Unit::TestCase
       assert_match %r(#{name_identifier_value}</saml:NameID>), inflated
     end
 
-    context "when the target url doesn't contain a query string" do
-      should "create the SAMLRequest parameter correctly" do
+    describe "when the target url doesn't contain a query string" do
+      it "create the SAMLRequest parameter correctly" do
         settings = OneLogin::RubySaml::Settings.new
         settings.idp_slo_target_url = "http://example.com"
         settings.name_identifier_value = "f00f00"
@@ -63,8 +63,8 @@ class RequestTest < Test::Unit::TestCase
       end
     end
 
-    context "when the target url contains a query string" do
-      should "create the SAMLRequest parameter correctly" do
+    describe "when the target url contains a query string" do
+      it "create the SAMLRequest parameter correctly" do
         settings = OneLogin::RubySaml::Settings.new
         settings.idp_slo_target_url = "http://example.com?field=value"
         settings.name_identifier_value = "f00f00"
@@ -74,8 +74,8 @@ class RequestTest < Test::Unit::TestCase
       end
     end
 
-    context "consumation of logout may need to track the transaction" do
-      should "have access to the request uuid" do
+    describe "consumation of logout may need to track the transaction" do
+      it "have access to the request uuid" do
         settings = OneLogin::RubySaml::Settings.new
         settings.idp_slo_target_url = "http://example.com?field=value"
         settings.name_identifier_value = "f00f00"
@@ -88,8 +88,8 @@ class RequestTest < Test::Unit::TestCase
       end
     end
 
-    context "when the settings indicate to sign (embebed) the logout request" do
-      should "created a signed logout request" do
+    describe "when the settings indicate to sign (embebed) the logout request" do
+      it "created a signed logout request" do
         settings = OneLogin::RubySaml::Settings.new
         settings.idp_slo_target_url = "http://example.com?field=value"
         settings.name_identifier_value = "f00f00"
@@ -106,7 +106,7 @@ class RequestTest < Test::Unit::TestCase
         assert_match %r[<ds:SignatureValue>([a-zA-Z0-9/+=]+)</ds:SignatureValue>], inflated
       end
 
-      should "create a signed logout request with 256 digest and signature methods" do
+      it "create a signed logout request with 256 digest and signature methods" do
         settings = OneLogin::RubySaml::Settings.new
         settings.compress_request = false
         settings.idp_slo_target_url = "http://example.com?field=value"
@@ -128,8 +128,8 @@ class RequestTest < Test::Unit::TestCase
       end
     end
 
-    context "when the settings indicate to sign the logout request" do
-      should "create a signature parameter" do
+    describe "when the settings indicate to sign the logout request" do
+      it "create a signature parameter" do
         settings = OneLogin::RubySaml::Settings.new
         settings.compress_request = false
         settings.idp_slo_target_url = "http://example.com?field=value"
@@ -153,16 +153,4 @@ class RequestTest < Test::Unit::TestCase
     end
 
   end
-
-  def decode_saml_request_payload(unauth_url)
-    payload = CGI.unescape(unauth_url.split("SAMLRequest=").last)
-    decoded = Base64.decode64(payload)
-
-    zstream = Zlib::Inflate.new(-Zlib::MAX_WBITS)
-    inflated = zstream.inflate(decoded)
-    zstream.finish
-    zstream.close
-    inflated
-  end
-
 end

test/logoutresponse_test.rb

@@ -1,35 +1,36 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 require 'rexml/document'
 require 'responses/logoutresponse_fixtures'
-class RubySamlTest < Test::Unit::TestCase
 
-  context "Logoutresponse" do
-    context "#new" do
-      should "raise an exception when response is initialized with nil" do
+class RubySamlTest < Minitest::Test
+
+  describe "Logoutresponse" do
+    describe "#new" do
+      it "raise an exception when response is initialized with nil" do
         assert_raises(ArgumentError) { OneLogin::RubySaml::Logoutresponse.new(nil) }
       end
-      should "default to empty settings" do
+      it "default to empty settings" do
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new( valid_response)
         assert_nil logoutresponse.settings
       end
-      should "accept constructor-injected settings" do
+      it "accept constructor-injected settings" do
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(valid_response, settings)
-        assert_not_nil logoutresponse.settings
+        refute_nil logoutresponse.settings
       end
-      should "accept constructor-injected options" do
+      it "accept constructor-injected options" do
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(valid_response, nil, { :foo => :bar} )
         assert !logoutresponse.options.empty?
       end
-      should "support base64 encoded responses" do
+      it "support base64 encoded responses" do
         expected_response = valid_response
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(Base64.encode64(expected_response), settings)
 
         assert_equal expected_response, logoutresponse.response
       end
     end
 
-    context "#validate" do
-      should "validate the response" do
+    describe "#validate" do
+      it "validate the response" do
         in_relation_to_request_id = random_id
 
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(valid_response({:uuid => in_relation_to_request_id}), settings)
@@ -42,35 +43,35 @@ class RubySamlTest < Test::Unit::TestCase
         assert logoutresponse.success?
       end
 
-      should "invalidate responses with wrong id when given option :matches_uuid" do
+      it "invalidate responses with wrong id when given option :matches_uuid" do
 
         expected_request_id = "_some_other_expected_uuid"
         opts = { :matches_request_id => expected_request_id}
 
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(valid_response, settings, opts)
 
         assert !logoutresponse.validate
-        assert_not_equal expected_request_id, logoutresponse.in_response_to
+        refute_equal expected_request_id, logoutresponse.in_response_to
       end
 
-      should "invalidate responses with wrong request status" do
+      it "invalidate responses with wrong request status" do
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(unsuccessful_response, settings)
 
         assert !logoutresponse.validate
         assert !logoutresponse.success?
       end
     end
 
-    context "#validate!" do
-      should "validates good responses" do
+    describe "#validate!" do
+      it "validates good responses" do
         in_relation_to_request_id = random_id
 
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(valid_response({:uuid => in_relation_to_request_id}), settings)
 
         logoutresponse.validate!
       end
 
-      should "raises validation error when matching for wrong request id" do
+      it "raises validation error when matching for wrong request id" do
 
         expected_request_id = "_some_other_expected_id"
         opts = { :matches_request_id => expected_request_id}
@@ -80,37 +81,30 @@ class RubySamlTest < Test::Unit::TestCase
         assert_raises(OneLogin::RubySaml::ValidationError) { logoutresponse.validate! }
       end
 
-      should "raise validation error for wrong request status" do
+      it "raise validation error for wrong request status" do
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(unsuccessful_response, settings)
 
         assert_raises(OneLogin::RubySaml::ValidationError) { logoutresponse.validate! }
       end
 
-      should "raise validation error when in bad state" do
+      it "raise validation error when in bad state" do
         # no settings
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(unsuccessful_response)
         assert_raises(OneLogin::RubySaml::ValidationError) { logoutresponse.validate! }
       end
 
-      should "raise validation error when in lack of issuer setting" do
+      it "raise validation error when in lack of issuer setting" do
         bad_settings = settings
         bad_settings.issuer = nil
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(unsuccessful_response, bad_settings)
         assert_raises(OneLogin::RubySaml::ValidationError) { logoutresponse.validate! }
       end
 
-      should "raise error for invalid xml" do
+      it "raise error for invalid xml" do
         logoutresponse = OneLogin::RubySaml::Logoutresponse.new(invalid_xml_response, settings)
 
         assert_raises(OneLogin::RubySaml::ValidationError) { logoutresponse.validate! }
       end
     end
-
   end
-
-  # logoutresponse fixtures
-  def random_id
-    "_#{UUID.new.generate}"
-  end
-
 end