ktdreyer pushed to rubygem-ruby-openid (master). "Update to ruby-openid 2.7.0 (RHBZ #1199116) (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 27 04:29:51 UTC 2015
From 5dd0c09314c7872a4d1d505688e5253798b8bbd1 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Tue, 26 May 2015 22:29:33 -0600
Subject: Update to ruby-openid 2.7.0 (RHBZ #1199116)
- Drop upstreamed patches
- Drop Fedora 19 support
diff --git a/.gitignore b/.gitignore
index 2d992cd..3d873c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/ruby-openid-2.3.0.gem
/ruby-openid-2.5.0.gem
/ruby-openid-2.6.0.gem
+/ruby-openid-2.7.0.gem
diff --git a/rubygem-ruby-openid-2.6.0-minitest.patch b/rubygem-ruby-openid-2.6.0-minitest.patch
deleted file mode 100644
index 5a696d6..0000000
--- a/rubygem-ruby-openid-2.6.0-minitest.patch
+++ /dev/null
@@ -1,2359 +0,0 @@
-From 57584d08e639bb9c28891e0bbca3b2a259d36ad0 Mon Sep 17 00:00:00 2001
-From: Ken Dreyer <ktdreyer at ktdreyer.com>
-Date: Mon, 7 Jul 2014 15:24:53 -0600
-Subject: [PATCH] Fedora: tests: switch to minitest
-
-This is a Fedora-specific patch that is different than what we will send
-upstream.
-
-In the upstream-suitable patch, I add minitest to the
-ruby-openid.gemspec. In Fedora we dynamically regenerate the .gemspec
-file, so it doesn't make sense to patch that.
-
-Upstream does not ship Gemfile, setup.rb, and admin/runtests.rb files in
-the .gem file. So we skip patching those here.
----
- test/test_accept.rb | 6 +--
- test/test_association.rb | 6 +--
- test/test_associationmanager.rb | 44 ++++++++----------
- test/test_ax.rb | 18 ++++----
- test/test_checkid_request.rb | 14 +++---
- test/test_consumer.rb | 10 ++--
- test/test_cryptutil.rb | 10 ++--
- test/test_dh.rb | 4 +-
- test/test_discover.rb | 32 ++++++-------
- test/test_discovery_manager.rb | 8 ++--
- test/test_extension.rb | 4 +-
- test/test_extras.rb | 4 +-
- test/test_fetchers.rb | 26 +++++------
- test/test_filters.rb | 14 +++---
- test/test_idres.rb | 64 ++++++++++---------------
- test/test_kvform.rb | 10 ++--
- test/test_kvpost.rb | 4 +-
- test/test_linkparse.rb | 8 ++--
- test/test_message.rb | 38 +++++++--------
- test/test_nonce.rb | 4 +-
- test/test_oauth.rb | 6 +--
- test/test_openid_yadis.rb | 4 +-
- test/test_pape.rb | 6 +--
- test/test_parsehtml.rb | 6 +--
- test/test_responses.rb | 4 +-
- test/test_server.rb | 100 ++++++++++++++++++++--------------------
- test/test_sreg.rb | 12 ++---
- test/test_stores.rb | 24 +++++-----
- test/test_trustroot.rb | 4 +-
- test/test_ui.rb | 4 +-
- test/test_urinorm.rb | 4 +-
- test/test_util.rb | 4 +-
- test/test_xrds.rb | 30 ++++++------
- test/test_xri.rb | 8 ++--
- test/test_xrires.rb | 4 +-
- test/test_yadis_discovery.rb | 10 ++--
- 36 files changed, 267 insertions(+), 291 deletions(-)
-
-diff --git a/test/test_accept.rb b/test/test_accept.rb
-index 2bc846a..0aa0acc 100644
---- a/test/test_accept.rb
-+++ b/test/test_accept.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'testutil'
- require 'openid/yadis/accept'
- require 'openid/extras'
-@@ -6,7 +6,7 @@ require 'openid/util'
-
- module OpenID
-
-- class AcceptTest < Test::Unit::TestCase
-+ class AcceptTest < Minitest::Test
- include TestDataMixin
-
- def getTestData()
-@@ -154,7 +154,7 @@ module OpenID
- ].each { |input, expected_header|
-
- if expected_header.nil?
-- assert_raise(ArgumentError) {
-+ assert_raises(ArgumentError) {
- Yadis.generate_accept_header(*input)
- }
- else
-diff --git a/test/test_association.rb b/test/test_association.rb
-index 127841d..dc9142b 100644
---- a/test/test_association.rb
-+++ b/test/test_association.rb
-@@ -1,8 +1,8 @@
--require "test/unit"
-+require "minitest/autorun"
- require "openid/association"
-
- module OpenID
-- class AssociationTestCase < Test::Unit::TestCase
-+ class AssociationTestCase < Minitest::Test
- def setup
- # Use this funny way of getting a time so that it does not have
- # fractional seconds, and so can be serialized exactly using our
-@@ -202,7 +202,7 @@ module OpenID
- end
- end
-
-- class AssociationNegotiatorTestCase < Test::Unit::TestCase
-+ class AssociationNegotiatorTestCase < Minitest::Test
- def assert_equal_under(item1, item2)
- val1 = yield(item1)
- val2 = yield(item2)
-diff --git a/test/test_associationmanager.rb b/test/test_associationmanager.rb
-index 1ee1c11..8a2eaf2 100644
---- a/test/test_associationmanager.rb
-+++ b/test/test_associationmanager.rb
-@@ -1,4 +1,4 @@
--require "test/unit"
-+require "minitest/autorun"
- require "openid/consumer/associationmanager"
- require "openid/association"
- require "openid/dh"
-@@ -10,14 +10,12 @@ require "util"
- require "time"
-
- module OpenID
-- class DHAssocSessionTest < Test::Unit::TestCase
-+ class DHAssocSessionTest < Minitest::Test
- def test_sha1_get_request
- # Initialized without an explicit DH gets defaults
- sess = Consumer::DiffieHellmanSHA1Session.new
- assert_equal(['dh_consumer_public'], sess.get_request.keys)
-- assert_nothing_raised do
-- Util::from_base64(sess.get_request['dh_consumer_public'])
-- end
-+ Util::from_base64(sess.get_request['dh_consumer_public'])
- end
-
- def test_sha1_get_request_custom_dh
-@@ -28,9 +26,7 @@ module OpenID
- req.keys.sort)
- assert_equal(dh.modulus, CryptUtil.base64_to_num(req['dh_modulus']))
- assert_equal(dh.generator, CryptUtil.base64_to_num(req['dh_gen']))
-- assert_nothing_raised do
-- Util::from_base64(req['dh_consumer_public'])
-- end
-+ Util::from_base64(req['dh_consumer_public'])
- end
- end
-
-@@ -102,7 +98,7 @@ module OpenID
- end
- end
-
-- class TestConsumerOpenID1DHSHA1 < Test::Unit::TestCase
-+ class TestConsumerOpenID1DHSHA1 < Minitest::Test
- include TestDiffieHellmanResponseParametersMixin
- class << self
- attr_reader :session_cls, :message_namespace
-@@ -112,7 +108,7 @@ module OpenID
- @message_namespace = OPENID1_NS
- end
-
-- class TestConsumerOpenID2DHSHA1 < Test::Unit::TestCase
-+ class TestConsumerOpenID2DHSHA1 < Minitest::Test
- include TestDiffieHellmanResponseParametersMixin
- class << self
- attr_reader :session_cls, :message_namespace
-@@ -122,7 +118,7 @@ module OpenID
- @message_namespace = OPENID2_NS
- end
-
-- class TestConsumerOpenID2DHSHA256 < Test::Unit::TestCase
-+ class TestConsumerOpenID2DHSHA256 < Minitest::Test
- include TestDiffieHellmanResponseParametersMixin
- class << self
- attr_reader :session_cls, :message_namespace
-@@ -132,7 +128,7 @@ module OpenID
- @message_namespace = OPENID2_NS
- end
-
-- class TestConsumerNoEncryptionSession < Test::Unit::TestCase
-+ class TestConsumerNoEncryptionSession < Minitest::Test
- def setup
- @sess = Consumer::NoEncryptionSession.new
- end
-@@ -149,7 +145,7 @@ module OpenID
- end
- end
-
-- class TestCreateAssociationRequest < Test::Unit::TestCase
-+ class TestCreateAssociationRequest < Minitest::Test
- def setup
- @server_url = 'http://invalid/'
- @assoc_manager = Consumer::AssociationManager.new(nil, @server_url)
-@@ -203,7 +199,7 @@ module OpenID
-
- # This is a random base-64 value, so just check that it's
- # present.
-- assert_not_nil(args.get_arg(OPENID1_NS, 'dh_consumer_public'))
-+ refute_nil(args.get_arg(OPENID1_NS, 'dh_consumer_public'))
- args.del_arg(OPENID1_NS, 'dh_consumer_public')
-
- # OK, session_type is set here and not for no-encryption
-@@ -216,7 +212,7 @@ module OpenID
- end
- end
-
-- class TestAssociationManagerExpiresIn < Test::Unit::TestCase
-+ class TestAssociationManagerExpiresIn < Minitest::Test
- def expires_in_msg(val)
- msg = Message.from_openid_args({'expires_in' => val})
- Consumer::AssociationManager.extract_expires_in(msg)
-@@ -248,7 +244,7 @@ module OpenID
- end
- end
-
-- class TestAssociationManagerCreateSession < Test::Unit::TestCase
-+ class TestAssociationManagerCreateSession < Minitest::Test
- def test_invalid
- assert_raises(ArgumentError) {
- Consumer::AssociationManager.create_session('monkeys')
-@@ -292,7 +288,7 @@ module OpenID
-
- # Test the session type negotiation behavior of an OpenID 2
- # consumer.
-- class TestOpenID2SessionNegotiation < Test::Unit::TestCase
-+ class TestOpenID2SessionNegotiation < Minitest::Test
- include NegotiationTestMixin
-
- Compat = false
-@@ -413,7 +409,7 @@ module OpenID
- # oidutil.log. See the calls to self.failUnlessLogMatches. Some of
- # these tests pass openid2-style messages to the openid 1
- # association processing logic to be sure it ignores the extra data.
-- class TestOpenID1SessionNegotiation < Test::Unit::TestCase
-+ class TestOpenID1SessionNegotiation < Minitest::Test
- include NegotiationTestMixin
-
- Compat = true
-@@ -498,7 +494,7 @@ module OpenID
- end
-
-
-- class TestExtractAssociation < Test::Unit::TestCase
-+ class TestExtractAssociation < Minitest::Test
- include ProtocolErrorMixin
-
- # An OpenID associate response (without the namespace)
-@@ -619,7 +615,7 @@ module OpenID
- end
- end
-
-- class GetOpenIDSessionTypeTest < Test::Unit::TestCase
-+ class GetOpenIDSessionTypeTest < Minitest::Test
- include TestUtil
-
- SERVER_URL = 'http://invalid/'
-@@ -666,7 +662,7 @@ module OpenID
- end
- end
-
-- class ExtractAssociationTest < Test::Unit::TestCase
-+ class ExtractAssociationTest < Minitest::Test
- include ProtocolErrorMixin
-
- SERVER_URL = 'http://invalid/'
-@@ -740,7 +736,7 @@ module OpenID
- end
- end
-
-- class TestExtractAssociationDiffieHellman < Test::Unit::TestCase
-+ class TestExtractAssociationDiffieHellman < Minitest::Test
- include ProtocolErrorMixin
-
- SECRET = 'x' * 20
-@@ -799,7 +795,7 @@ module OpenID
- end
- end
-
-- class TestAssocManagerGetAssociation < Test::Unit::TestCase
-+ class TestAssocManagerGetAssociation < Minitest::Test
- include FetcherMixin
- include TestUtil
-
-@@ -859,7 +855,7 @@ module OpenID
- end
- end
-
-- class TestAssocManagerRequestAssociation < Test::Unit::TestCase
-+ class TestAssocManagerRequestAssociation < Minitest::Test
- include FetcherMixin
- include TestUtil
-
-diff --git a/test/test_ax.rb b/test/test_ax.rb
-index c87f746..b1cd399 100644
---- a/test/test_ax.rb
-+++ b/test/test_ax.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/extensions/ax'
- require 'openid/message'
- require 'openid/consumer/responses'
-@@ -23,7 +23,7 @@ module OpenID
- end
- end
-
-- class AXMessageTest < Test::Unit::TestCase
-+ class AXMessageTest < Minitest::Test
- def setup
- @bax = BogusAXMessage.new
- end
-@@ -38,7 +38,7 @@ module OpenID
- end
- end
-
-- class AttrInfoTest < Test::Unit::TestCase
-+ class AttrInfoTest < Minitest::Test
- def test_construct
- assert_raises(ArgumentError) { AttrInfo.new }
- type_uri = 'uri geller'
-@@ -51,7 +51,7 @@ module OpenID
- end
- end
-
-- class ToTypeURIsTest < Test::Unit::TestCase
-+ class ToTypeURIsTest < Minitest::Test
- def setup
- @aliases = NamespaceMap.new
- end
-@@ -91,7 +91,7 @@ module OpenID
- end
- end
-
-- class ParseAXValuesTest < Test::Unit::TestCase
-+ class ParseAXValuesTest < Minitest::Test
- def ax_values(ax_args, expected_args)
- msg = KeyValueMessage.new
- msg.parse_extension_args(ax_args)
-@@ -221,7 +221,7 @@ module OpenID
- end
- end
-
-- class FetchRequestTest < Test::Unit::TestCase
-+ class FetchRequestTest < Minitest::Test
- def setup
- @msg = FetchRequest.new
- @type_a = 'http://janrain.example.com/a'
-@@ -483,7 +483,7 @@ module OpenID
- end
- end
-
-- class FetchResponseTest < Test::Unit::TestCase
-+ class FetchResponseTest < Minitest::Test
- def setup
- @msg = FetchResponse.new
- @value_a = 'commodity'
-@@ -675,7 +675,7 @@ module OpenID
- end
- end
-
-- class StoreRequestTest < Test::Unit::TestCase
-+ class StoreRequestTest < Minitest::Test
- def setup
- @msg = StoreRequest.new
- @type_a = 'http://oranges.are.for/'
-@@ -729,7 +729,7 @@ module OpenID
- end
- end
-
-- class StoreResponseTest < Test::Unit::TestCase
-+ class StoreResponseTest < Minitest::Test
- def test_success
- msg = StoreResponse.new
- assert(msg.succeeded?)
-diff --git a/test/test_checkid_request.rb b/test/test_checkid_request.rb
-index efaa1dd..884ba4a 100644
---- a/test/test_checkid_request.rb
-+++ b/test/test_checkid_request.rb
-@@ -1,4 +1,4 @@
--require "test/unit"
-+require "minitest/autorun"
- require "openid/consumer/checkid_request"
- require "openid/message"
- require "testutil"
-@@ -135,7 +135,7 @@ module OpenID
- end
- end
-
-- class TestCheckIDRequestOpenID2 < Test::Unit::TestCase
-+ class TestCheckIDRequestOpenID2 < Minitest::Test
- include CheckIDTestMixin
-
- def immediate
-@@ -167,8 +167,8 @@ module OpenID
- # OpenID Checkid_Requests should be able to set 'anonymous' to true.
- def test_set_anonymous_works_for_openid2
- assert(@checkid_req.message.is_openid2)
-- assert_nothing_raised {@checkid_req.anonymous = true}
-- assert_nothing_raised {@checkid_req.anonymous = false}
-+ @checkid_req.anonymous = true
-+ @checkid_req.anonymous = false
- end
-
- def test_user_anonymous_ignores_identfier
-@@ -207,7 +207,7 @@ module OpenID
- end
- end
-
-- class TestCheckIDRequestOpenID1 < Test::Unit::TestCase
-+ class TestCheckIDRequestOpenID1 < Minitest::Test
- include CheckIDTestMixin
-
- def immediate
-@@ -248,9 +248,7 @@ module OpenID
- assert_raises(ArgumentError) {
- @checkid_req.anonymous = true
- }
-- assert_nothing_raised{
-- @checkid_req.anonymous = false
-- }
-+ @checkid_req.anonymous = false
- end
-
- # Identfier select SHOULD NOT be sent, but this pathway is in
-diff --git a/test/test_consumer.rb b/test/test_consumer.rb
-index 0594488..1e1dc7a 100644
---- a/test/test_consumer.rb
-+++ b/test/test_consumer.rb
-@@ -1,11 +1,11 @@
--require "test/unit"
-+require "minitest/autorun"
- require "testutil"
- require "openid/consumer"
-
- module OpenID
- class Consumer
- module TestConsumer
-- class TestLastEndpoint < Test::Unit::TestCase
-+ class TestLastEndpoint < Minitest::Test
- def test_set_get
- session = {}
- consumer = Consumer.new(session, nil)
-@@ -20,7 +20,7 @@ module OpenID
- end
- end
-
-- class TestBegin < Test::Unit::TestCase
-+ class TestBegin < Minitest::Test
- attr_accessor :user_input, :anonymous, :services,
- :discovered_identifier, :checkid_request, :service
-
-@@ -79,7 +79,7 @@ module OpenID
- end
- end
-
-- class TestBeginWithoutDiscovery < Test::Unit::TestCase
-+ class TestBeginWithoutDiscovery < Minitest::Test
- attr_reader :assoc
- def setup
- @session = {}
-@@ -154,7 +154,7 @@ module OpenID
- end
- end
-
-- class TestComplete < Test::Unit::TestCase
-+ class TestComplete < Minitest::Test
- def setup
- @session = {}
- @consumer = Consumer.new(@session, nil)
-diff --git a/test/test_cryptutil.rb b/test/test_cryptutil.rb
-index 6a4455e..2f27254 100644
---- a/test/test_cryptutil.rb
-+++ b/test/test_cryptutil.rb
-@@ -1,9 +1,9 @@
- # coding: ASCII-8BIT
--require "test/unit"
-+require "minitest/autorun"
- require "openid/cryptutil"
- require "pathname"
-
--class CryptUtilTestCase < Test::Unit::TestCase
-+class CryptUtilTestCase < Minitest::Test
- BIG = 2 ** 256
-
- def test_rand
-@@ -16,7 +16,7 @@ class CryptUtilTestCase < Test::Unit::TestCase
- b = OpenID::CryptUtil.rand(BIG)
- assert(a.is_a?(Bignum))
- assert(b.is_a?(Bignum))
-- assert_not_equal(a, b)
-+ refute_equal(a, b)
- end
-
- def test_rand_doesnt_depend_on_srand
-@@ -24,7 +24,7 @@ class CryptUtilTestCase < Test::Unit::TestCase
- a = OpenID::CryptUtil.rand(BIG)
- Kernel.srand(1)
- b = OpenID::CryptUtil.rand(BIG)
-- assert_not_equal(a, b)
-+ refute_equal(a, b)
- end
-
- def test_random_binary_convert
-@@ -89,7 +89,7 @@ class CryptUtilTestCase < Test::Unit::TestCase
- assert_equal(42, s1.length)
- s2 = OpenID::CryptUtil.random_string(42)
- assert_equal(42, s2.length)
-- assert_not_equal(s1, s2)
-+ refute_equal(s1, s2)
- end
-
- def test_randomstring_population
-diff --git a/test/test_dh.rb b/test/test_dh.rb
-index b157560..2eba5b4 100644
---- a/test/test_dh.rb
-+++ b/test/test_dh.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'testutil'
- require 'openid/dh'
-
-@@ -9,7 +9,7 @@ module OpenID
- end
- end
-
-- class DiffieHellmanTestCase < Test::Unit::TestCase
-+ class DiffieHellmanTestCase < Minitest::Test
- include OpenID::TestDataMixin
-
- NUL = "\x00"
-diff --git a/test/test_discover.rb b/test/test_discover.rb
-index 8c6dca6..8c20826 100644
---- a/test/test_discover.rb
-+++ b/test/test_discover.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'testutil'
- require 'util'
- require 'openid/fetchers'
-@@ -26,7 +26,7 @@ module OpenID
- end
- end
-
-- class TestDiscoveryFailure < Test::Unit::TestCase
-+ class TestDiscoveryFailure < Minitest::Test
- def initialize(*args)
- super(*args)
-
-@@ -80,7 +80,7 @@ module OpenID
- # Custom exception just to make sure it's not handled differently
- end
-
-- class TestFetchException < Test::Unit::TestCase
-+ class TestFetchException < Minitest::Test
- # Discovery should only raise DiscoveryFailure
-
- def initialize(*args)
-@@ -107,7 +107,7 @@ module OpenID
-
- ### Tests for openid.consumer.discover.discover
-
-- class TestNormalization < Test::Unit::TestCase
-+ class TestNormalization < Minitest::Test
- def test_addingProtocol
- f = ErrorRaisingFetcher.new(RuntimeError.new())
- OpenID.fetcher = f
-@@ -152,7 +152,7 @@ module OpenID
- end
- end
-
-- class BaseTestDiscovery < Test::Unit::TestCase
-+ class BaseTestDiscovery < Minitest::Test
- attr_accessor :id_url, :fetcher_class
-
- def initialize(*args)
-@@ -247,7 +247,7 @@ module OpenID
- end
-
- def test_404
-- assert_raise(DiscoveryFailure) {
-+ assert_raises(DiscoveryFailure) {
- OpenID.discover(@id_url + '/404')
- }
- end
-@@ -475,7 +475,7 @@ module OpenID
- end
-
- def test_yadis2BadLocalID
-- assert_raise(DiscoveryFailure) {
-+ assert_raises(DiscoveryFailure) {
- _discover('application/xrds+xml',
- read_data_file('test_discover/yadis_2_bad_local_id.xml', false),
- 1)
-@@ -497,7 +497,7 @@ module OpenID
- end
-
- def test_yadis1And2BadLocalID
-- assert_raise(DiscoveryFailure) {
-+ assert_raises(DiscoveryFailure) {
- _discover('application/xrds+xml',
- read_data_file('test_discover/openid_1_and_2_xrds_bad_delegate.xml', false),
- 1)
-@@ -641,7 +641,7 @@ module OpenID
- end
- end
-
-- class TestPreferredNamespace < Test::Unit::TestCase
-+ class TestPreferredNamespace < Minitest::Test
- def initialize(*args)
- super(*args)
-
-@@ -670,7 +670,7 @@ module OpenID
- end
- end
-
-- class TestIsOPIdentifier < Test::Unit::TestCase
-+ class TestIsOPIdentifier < Minitest::Test
- def setup
- @endpoint = OpenIDServiceEndpoint.new()
- end
-@@ -713,7 +713,7 @@ module OpenID
- end
- end
-
-- class TestFromOPEndpointURL < Test::Unit::TestCase
-+ class TestFromOPEndpointURL < Minitest::Test
- def setup
- @op_endpoint_url = 'http://example.com/op/endpoint'
- @endpoint = OpenIDServiceEndpoint.from_op_endpoint_url(@op_endpoint_url)
-@@ -741,7 +741,7 @@ module OpenID
- end
- end
-
-- class TestDiscoverFunction < Test::Unit::TestCase
-+ class TestDiscoverFunction < Minitest::Test
- def test_discover_function
- # XXX these were all different tests in python, but they're
- # combined here so I only have to use with_method_overridden
-@@ -767,7 +767,7 @@ module OpenID
- end
- end
-
-- class TestEndpointSupportsType < Test::Unit::TestCase
-+ class TestEndpointSupportsType < Minitest::Test
- def setup
- @endpoint = OpenIDServiceEndpoint.new()
- end
-@@ -830,7 +830,7 @@ module OpenID
- end
- end
-
-- class TestEndpointDisplayIdentifier < Test::Unit::TestCase
-+ class TestEndpointDisplayIdentifier < Minitest::Test
- def test_strip_fragment
- @endpoint = OpenIDServiceEndpoint.new()
- @endpoint.claimed_id = 'http://recycled.invalid/#123'
-@@ -839,9 +839,9 @@ module OpenID
- end
-
-
-- class TestNormalizeURL < Test::Unit::TestCase
-+ class TestNormalizeURL < Minitest::Test
- def test_no_host
-- assert_raise(DiscoveryFailure) {
-+ assert_raises(DiscoveryFailure) {
- OpenID::normalize_url('http:///too-many.invalid/slashes')
- }
- end
-diff --git a/test/test_discovery_manager.rb b/test/test_discovery_manager.rb
-index 10dae15..68f1341 100644
---- a/test/test_discovery_manager.rb
-+++ b/test/test_discovery_manager.rb
-@@ -1,10 +1,10 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/consumer/discovery_manager'
- require 'openid/extras'
- require 'testutil'
-
- module OpenID
-- class TestDiscoveredServices < Test::Unit::TestCase
-+ class TestDiscoveredServices < Minitest::Test
- def setup
- @starting_url = "http://starting.url.com/"
- @yadis_url = "http://starting.url.com/xrds"
-@@ -64,7 +64,7 @@ module OpenID
- end
- end
-
-- class TestDiscoveryManager < Test::Unit::TestCase
-+ class TestDiscoveryManager < Minitest::Test
- def setup
- session = {}
- @session = OpenID::Consumer::Session.new(session, OpenID::Consumer::DiscoveredServices)
-@@ -198,7 +198,7 @@ module OpenID
-
- # Calling create_manager with a preexisting manager should
- # result in StandardError.
-- assert_raise(StandardError) {
-+ assert_raises(StandardError) {
- @manager.create_manager(@yadis_url, services)
- }
-
-diff --git a/test/test_extension.rb b/test/test_extension.rb
-index 13cfd99..63e6f73 100644
---- a/test/test_extension.rb
-+++ b/test/test_extension.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/extension'
- require 'openid/message'
-
-@@ -16,7 +16,7 @@ module OpenID
- end
- end
-
-- class ToMessageTest < Test::Unit::TestCase
-+ class ToMessageTest < Minitest::Test
- def test_OpenID1
- oid1_msg = Message.new(OPENID1_NS)
- ext = DummyExtension.new
-diff --git a/test/test_extras.rb b/test/test_extras.rb
-index c30861c..b2c4343 100644
---- a/test/test_extras.rb
-+++ b/test/test_extras.rb
-@@ -1,7 +1,7 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/extras'
-
--class StartsWithTestCase < Test::Unit::TestCase
-+class StartsWithTestCase < Minitest::Test
- def test_starts_with
- [["anything", ""],
- ["something else", ""],
-diff --git a/test/test_fetchers.rb b/test/test_fetchers.rb
-index b9dfe93..452a928 100644
---- a/test/test_fetchers.rb
-+++ b/test/test_fetchers.rb
-@@ -1,5 +1,5 @@
- # encoding: utf-8
--require 'test/unit'
-+require 'minitest/autorun'
- require 'net/http'
- require 'webrick'
- require 'testutil'
-@@ -35,7 +35,7 @@ class BogusFetcher
- end
- end
-
--class FetcherTestCase < Test::Unit::TestCase
-+class FetcherTestCase < Minitest::Test
- include HttpResultAssertions
- include OpenID::TestUtil
-
-@@ -243,8 +243,8 @@ EOHTML
- def test_redirect_limit
- @_redirect_counter = 0
- uri = _uri_build('/redirect_loop')
-- assert_raise(OpenID::HTTPRedirectLimitReached) {
-- @fetcher.fetch(uri)
-+ assert_raises(OpenID::HTTPRedirectLimitReached) {
-+ @fetcher.fetch(uri, redirect_limit=0)
- }
- end
-
-@@ -399,7 +399,7 @@ EOF
- nil
- end
-
-- assert_raise(RuntimeError) {
-+ assert_raises(RuntimeError) {
- f.make_connection(URI::parse("http://example.com/"))
- }
- end
-@@ -412,7 +412,7 @@ EOF
- "not a Net::HTTP object"
- end
-
-- assert_raise(RuntimeError) {
-+ assert_raises(RuntimeError) {
- f.make_connection(URI::parse("http://example.com/"))
- }
- end
-@@ -431,7 +431,7 @@ EOF
- BrokenSSLConnection.new
- end
-
-- assert_raise(OpenID::SSLFetchingError) {
-+ assert_raises(OpenID::SSLFetchingError) {
- f.fetch("https://bogus.com/")
- }
- end
-@@ -450,7 +450,7 @@ EOF
- TimeoutConnection.new
- end
-
-- assert_raise(OpenID::FetchingError) {
-+ assert_raises(OpenID::FetchingError) {
- f.fetch("https://bogus.com/")
- }
- end
-@@ -494,7 +494,7 @@ EOF
- end
-
- # post_connection_check should not be called.
-- assert_raise(TestingException) {
-+ assert_raises(TestingException) {
- f.fetch("https://bogus.com/")
- }
- end
-@@ -508,7 +508,7 @@ EOF
- end
-
- # post_connection_check should not be called.
-- assert_raise(TestingException) {
-+ assert_raises(TestingException) {
- f.fetch("https://bogus.com/")
- }
- end
-@@ -538,13 +538,13 @@ EOF
- end
-
- # post_connection_check should be called.
-- assert_raise(PostConnectionCheckException) {
-+ assert_raises(PostConnectionCheckException) {
- f.fetch("https://bogus.com/")
- }
- end
- end
-
--class DefaultFetcherTest < Test::Unit::TestCase
-+class DefaultFetcherTest < Minitest::Test
- def setup
- OpenID.fetcher = nil
- end
-@@ -564,7 +564,7 @@ class DefaultFetcherTest < Test::Unit::TestCase
- end
- end
-
--class ProxyTest < Test::Unit::TestCase
-+class ProxyTest < Minitest::Test
- def test_proxy_unreachable
- begin
- f = OpenID::StandardFetcher.new('127.0.0.1', 1)
-diff --git a/test/test_filters.rb b/test/test_filters.rb
-index 0b4c7cd..4817874 100644
---- a/test/test_filters.rb
-+++ b/test/test_filters.rb
-@@ -1,11 +1,11 @@
--require "test/unit"
-+require "minitest/autorun"
- require "testutil"
- require "rexml/document"
- require "openid/yadis/xrds"
- require "openid/yadis/filters"
-
- module OpenID
-- class BasicServiceEndpointTest < Test::Unit::TestCase
-+ class BasicServiceEndpointTest < Minitest::Test
- def test_match_types
- # Make sure the match_types operation returns the expected
- # results with various inputs.
-@@ -39,7 +39,7 @@ module OpenID
- end
- end
-
-- class TransformFilterMakerTest < Test::Unit::TestCase
-+ class TransformFilterMakerTest < Minitest::Test
- def make_service_element(types, uris)
- service = REXML::Element.new('Service')
- types.each { |type_text|
-@@ -143,7 +143,7 @@ module OpenID
- end
- end
-
-- class CompoundFilterTest < Test::Unit::TestCase
-+ class CompoundFilterTest < Minitest::Test
- def test_get_service_endpoints
- first = ["bogus", "test"]
- second = ["third"]
-@@ -159,7 +159,7 @@ module OpenID
- end
- end
-
-- class MakeFilterTest < Test::Unit::TestCase
-+ class MakeFilterTest < Minitest::Test
- def test_parts_nil
- result = Yadis.make_filter(nil)
- assert result.is_a?(Yadis::TransformFilterMaker)
-@@ -182,7 +182,7 @@ module OpenID
- end
- end
-
-- class MakeCompoundFilterTest < Test::Unit::TestCase
-+ class MakeCompoundFilterTest < Minitest::Test
- def test_no_filters
- result = Yadis.mk_compound_filter([])
- assert result.subfilters == []
-@@ -251,7 +251,7 @@ module OpenID
- # Pass various non-filter objects and make sure the filter
- # machinery explodes.
- [nil, ["bogus"], [1], [nil, "bogus"]].each { |thing|
-- assert_raise(TypeError) {
-+ assert_raises(TypeError) {
- Yadis.mk_compound_filter(thing)
- }
- }
-diff --git a/test/test_idres.rb b/test/test_idres.rb
-index bb9319a..9503a49 100644
---- a/test/test_idres.rb
-+++ b/test/test_idres.rb
-@@ -1,4 +1,4 @@
--require "test/unit"
-+require "minitest/autorun"
- require "testutil"
- require "util"
- require "openid/consumer/idres"
-@@ -18,7 +18,7 @@ module OpenID
- end
- end
-
-- class CheckForFieldsTest < Test::Unit::TestCase
-+ class CheckForFieldsTest < Minitest::Test
- include ProtocolErrorMixin
-
- BASE_FIELDS = ['return_to', 'assoc_handle', 'sig', 'signed']
-@@ -142,21 +142,17 @@ module OpenID
- def test_success_openid1
- msg = mkMsg(OPENID1_NS, OPENID1_FIELDS, OPENID1_SIGNED)
- idres = IdResHandler.new(msg, nil)
-- assert_nothing_raised {
-- idres.send(:check_for_fields)
-- }
-+ idres.send(:check_for_fields)
- end
-
- def test_success_openid1_1
- msg = mkMsg(OPENID11_NS, OPENID1_FIELDS, OPENID1_SIGNED)
- idres = IdResHandler.new(msg, nil)
-- assert_nothing_raised {
-- idres.send(:check_for_fields)
-- }
-+ idres.send(:check_for_fields)
- end
- end
-
-- class ReturnToArgsTest < Test::Unit::TestCase
-+ class ReturnToArgsTest < Minitest::Test
- include OpenID::ProtocolErrorMixin
-
- def check_return_to_args(query)
-@@ -175,13 +171,11 @@ module OpenID
- end
-
- def test_return_to_args_okay
-- assert_nothing_raised {
-- check_return_to_args({
-- 'openid.mode' => 'id_res',
-- 'openid.return_to' => 'http://example.com/?foo=bar',
-- 'foo' => 'bar',
-- })
-- }
-+ check_return_to_args({
-+ 'openid.mode' => 'id_res',
-+ 'openid.return_to' => 'http://example.com/?foo=bar',
-+ 'foo' => 'bar',
-+ })
- end
-
- def test_unexpected_arg_okay
-@@ -206,7 +200,7 @@ module OpenID
- end
- end
-
-- class ReturnToVerifyTest < Test::Unit::TestCase
-+ class ReturnToVerifyTest < Minitest::Test
- def test_bad_return_to
- return_to = "http://some.url/path?foo=bar"
-
-@@ -250,9 +244,7 @@ module OpenID
- args['openid.return_to'] = return_to
- msg = Message.from_post_args(args)
- idres = IdResHandler.new(msg, base)
-- assert_nothing_raised {
-- idres.send(:verify_return_to)
-- }
-+ idres.send(:verify_return_to)
- end
- end
- end
-@@ -264,7 +256,7 @@ module OpenID
- end
- end
-
-- class CheckSigTest < Test::Unit::TestCase
-+ class CheckSigTest < Minitest::Test
- include ProtocolErrorMixin
- include TestUtil
-
-@@ -301,9 +293,7 @@ module OpenID
- end
-
- def test_sign_good
-- assert_nothing_raised {
-- call_check_sig(&method(:no_check_auth))
-- }
-+ call_check_sig(&method(:no_check_auth))
- end
-
- def test_bad_sig
-@@ -423,7 +413,7 @@ module OpenID
-
- end
-
-- class CheckAuthResponseTest < Test::Unit::TestCase
-+ class CheckAuthResponseTest < Minitest::Test
- include TestUtil
- include ProtocolErrorMixin
-
-@@ -482,7 +472,7 @@ module OpenID
- end
- end
-
-- class NonceTest < Test::Unit::TestCase
-+ class NonceTest < Minitest::Test
- include TestUtil
- include ProtocolErrorMixin
-
-@@ -513,9 +503,7 @@ module OpenID
- {'openid.ns' => OPENID1_NS},
- {'openid.ns' => OPENID11_NS}
- ].each do |args|
-- assert_nothing_raised {
-- call_check_nonce({'rp_nonce' => @nonce}.merge(args), true)
-- }
-+ call_check_nonce({'rp_nonce' => @nonce}.merge(args), true)
- end
- end
-
-@@ -536,10 +524,8 @@ module OpenID
- end
-
- def test_openid2_success
-- assert_nothing_raised {
-- call_check_nonce({'openid.response_nonce' => @nonce,
-- 'openid.ns' => OPENID2_NS}, true)
-- }
-+ call_check_nonce({'openid.response_nonce' => @nonce,
-+ 'openid.ns' => OPENID2_NS}, true)
- end
-
- def test_openid1_ignore_response_nonce
-@@ -555,9 +541,7 @@ module OpenID
-
- def test_no_store
- @store = nil
-- assert_nothing_raised {
-- call_check_nonce({'rp_nonce' => @nonce})
-- }
-+ call_check_nonce({'rp_nonce' => @nonce})
- end
-
- def test_already_used
-@@ -573,7 +557,7 @@ module OpenID
- end
- end
-
-- class DiscoveryVerificationTest < Test::Unit::TestCase
-+ class DiscoveryVerificationTest < Minitest::Test
- include ProtocolErrorMixin
- include TestUtil
-
-@@ -875,7 +859,7 @@ module OpenID
- end
- end
-
-- class IdResTopLevelTest < Test::Unit::TestCase
-+ class IdResTopLevelTest < Minitest::Test
- def test_id_res
- endpoint = OpenIDServiceEndpoint.new
- endpoint.server_url = 'http://invalid/server'
-@@ -919,7 +903,7 @@ module OpenID
- end
-
-
-- class DiscoverAndVerifyTest < Test::Unit::TestCase
-+ class DiscoverAndVerifyTest < Minitest::Test
- include ProtocolErrorMixin
- include TestUtil
-
-@@ -942,7 +926,7 @@ module OpenID
- end
- end
-
-- class VerifyDiscoveredServicesTest < Test::Unit::TestCase
-+ class VerifyDiscoveredServicesTest < Minitest::Test
- include ProtocolErrorMixin
- include TestUtil
-
-diff --git a/test/test_kvform.rb b/test/test_kvform.rb
-index 9226057..69224d8 100644
---- a/test/test_kvform.rb
-+++ b/test/test_kvform.rb
-@@ -1,11 +1,11 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/kvform'
- require 'openid/util'
- require 'util'
-
- include OpenID
-
--class KVFormTests < Test::Unit::TestCase
-+class KVFormTests < Minitest::Test
- include OpenID::TestUtil
-
- def test_kvdict
-@@ -57,7 +57,7 @@ class KVFormTests < Test::Unit::TestCase
- # Strict mode should raise KVFormError instead of logging
- # messages
- if warnings > 0
-- assert_raise(KVFormError) do
-+ assert_raises(KVFormError) do
- Util.kv_to_seq(kv, true)
- end
- end
-@@ -120,7 +120,7 @@ class KVFormTests < Test::Unit::TestCase
- # Strict mode should raise KVFormError instead of logging
- # messages
- if warnings > 0
-- assert_raise(KVFormError) do
-+ assert_raises(KVFormError) do
- Util.seq_to_kv(seq, true)
- end
- end
-@@ -151,7 +151,7 @@ class KVFormTests < Test::Unit::TestCase
- def _run_kvexcTest(case_)
- seq = case_
-
-- assert_raise(KVFormError) do
-+ assert_raises(KVFormError) do
- Util.seq_to_kv(seq)
- end
- end
-diff --git a/test/test_kvpost.rb b/test/test_kvpost.rb
-index fb09893..de1cb09 100644
---- a/test/test_kvpost.rb
-+++ b/test/test_kvpost.rb
-@@ -1,11 +1,11 @@
--require "test/unit"
-+require "minitest/autorun"
- require "testutil"
- require "openid/kvpost"
- require "openid/kvform"
- require "openid/message"
-
- module OpenID
-- class KVPostTestCase < Test::Unit::TestCase
-+ class KVPostTestCase < Minitest::Test
- include FetcherMixin
-
- def mk_resp(status, resp_hash)
-diff --git a/test/test_linkparse.rb b/test/test_linkparse.rb
-index 9a50429..49e3042 100644
---- a/test/test_linkparse.rb
-+++ b/test/test_linkparse.rb
-@@ -1,8 +1,8 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'testutil'
- require 'openid/consumer/html_parse'
-
--class LinkParseTestCase < Test::Unit::TestCase
-+class LinkParseTestCase < Minitest::Test
- include OpenID::TestDataMixin
-
- def attr_cmp(expected, found)
-@@ -105,9 +105,7 @@ class LinkParseTestCase < Test::Unit::TestCase
- else
- html = "<html><body>hello joel\255</body></html>"
- end
-- assert_nothing_raised do
-- OpenID::parse_link_attrs(html)
-- end
-+ OpenID::parse_link_attrs(html)
-
- end
- end
-diff --git a/test/test_message.rb b/test/test_message.rb
-index cc55f52..b7f6efb 100644
---- a/test/test_message.rb
-+++ b/test/test_message.rb
-@@ -1,5 +1,5 @@
- # last synced with Python openid.test.test_message on 6/29/2007.
--require 'test/unit'
-+require 'minitest/autorun'
- require 'util'
- require 'openid/message'
- require 'rexml/document'
-@@ -14,7 +14,7 @@ module OpenID
-
- if expected.nil?
- assert_equal(@m.get_arg(ns, key, :a_default), :a_default)
-- assert_raise(Message::KeyNotFound) { @m.get_arg(ns, key, NO_DEFAULT) }
-+ assert_raises(Message::KeyNotFound) { @m.get_arg(ns, key, NO_DEFAULT) }
- else
- assert_equal(@m.get_arg(ns, key, :a_default), expected)
- assert_equal(@m.get_arg(ns, key, NO_DEFAULT), expected)
-@@ -24,7 +24,7 @@ module OpenID
-
- end
-
-- class EmptyMessageTestCase < Test::Unit::TestCase
-+ class EmptyMessageTestCase < Minitest::Test
- include GetArgsMixin
-
- def setup
-@@ -77,7 +77,7 @@ module OpenID
- end
-
- def test_get_key_openid
-- assert_raise(UndefinedOpenIDNamespace) {
-+ assert_raises(UndefinedOpenIDNamespace) {
- @m.get_key(OPENID_NS, nil)
- }
- end
-@@ -99,7 +99,7 @@ module OpenID
- end
-
- def test_has_key
-- assert_raise(UndefinedOpenIDNamespace) {
-+ assert_raises(UndefinedOpenIDNamespace) {
- @m.has_key?(OPENID_NS, 'foo')
- }
- end
-@@ -121,7 +121,7 @@ module OpenID
- end
-
- def test_get_arg
-- assert_raise(UndefinedOpenIDNamespace) {
-+ assert_raises(UndefinedOpenIDNamespace) {
- @m.get_args(OPENID_NS)
- }
- end
-@@ -143,7 +143,7 @@ module OpenID
- end
-
- def test_get_args
-- assert_raise(UndefinedOpenIDNamespace) {
-+ assert_raises(UndefinedOpenIDNamespace) {
- @m.get_args(OPENID_NS)
- }
- end
-@@ -165,7 +165,7 @@ module OpenID
- end
-
- def test_update_args
-- assert_raise(UndefinedOpenIDNamespace) {
-+ assert_raises(UndefinedOpenIDNamespace) {
- @m.update_args(OPENID_NS, {'does not'=>'matter'})
- }
- end
-@@ -194,7 +194,7 @@ module OpenID
- end
-
- def test_set_arg
-- assert_raise(UndefinedOpenIDNamespace) {
-+ assert_raises(UndefinedOpenIDNamespace) {
- @m.set_arg(OPENID_NS,'does not','matter')
- }
- end
-@@ -221,7 +221,7 @@ module OpenID
- end
-
- def test_del_arg
-- assert_raise(UndefinedOpenIDNamespace) {
-+ assert_raises(UndefinedOpenIDNamespace) {
- @m.set_arg(OPENID_NS, 'does not', 'matter')
- }
- end
-@@ -253,13 +253,13 @@ module OpenID
- end
-
- def test_set_openid_namespace
-- assert_raise(InvalidOpenIDNamespace) {
-+ assert_raises(InvalidOpenIDNamespace) {
- @m.set_openid_namespace('http://invalid/', false)
- }
- end
- end
-
-- class OpenID1MessageTest < Test::Unit::TestCase
-+ class OpenID1MessageTest < Minitest::Test
- include GetArgsMixin
-
- def setup
-@@ -497,7 +497,7 @@ module OpenID
-
- def test_equal
- assert_equal(Message.new, Message.new)
-- assert_not_equal(Message.new, nil)
-+ refute_equal(Message.new, nil)
- end
-
- def test_from_openid_args_undefined_ns
-@@ -520,7 +520,7 @@ module OpenID
- end
- end
-
-- class OpenID1ExplicitMessageTest < Test::Unit::TestCase
-+ class OpenID1ExplicitMessageTest < Minitest::Test
- # XXX - check to make sure the test suite will get built the way this
- # expects.
- def setup
-@@ -586,7 +586,7 @@ module OpenID
-
- end
-
-- class OpenID2MessageTest < Test::Unit::TestCase
-+ class OpenID2MessageTest < Minitest::Test
- include TestUtil
-
- def setup
-@@ -837,7 +837,7 @@ module OpenID
- # .fromPostArgs covers .fromPostArgs, .fromOpenIDArgs,
- # ._fromOpenIDArgs, and .fromOpenIDArgs (since it calls
- # .fromPostArgs).
-- assert_raise(AssertionError) {
-+ assert_raises(AssertionError) {
- Message.from_post_args(args)
- }
- }
-@@ -877,7 +877,7 @@ module OpenID
- end
-
- def test_argList
-- assert_raise(ArgumentError) {
-+ assert_raises(ArgumentError) {
- Message.from_post_args({'arg' => [1, 2, 3]})
- }
- end
-@@ -891,7 +891,7 @@ module OpenID
- end
- end
-
-- class MessageTest < Test::Unit::TestCase
-+ class MessageTest < Minitest::Test
- def setup
- @postargs = {
- 'openid.ns' => OPENID2_NS,
-@@ -1042,7 +1042,7 @@ module OpenID
- end
- end
-
-- class NamespaceMapTestCase < Test::Unit::TestCase
-+ class NamespaceMapTestCase < Minitest::Test
-
- def test_onealias
- nsm = NamespaceMap.new
-diff --git a/test/test_nonce.rb b/test/test_nonce.rb
-index b8a1a05..cc8fd92 100644
---- a/test/test_nonce.rb
-+++ b/test/test_nonce.rb
-@@ -1,8 +1,8 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/store/nonce'
-
- module OpenID
-- class NonceTestCase < Test::Unit::TestCase
-+ class NonceTestCase < Minitest::Test
-
- NONCE_RE = /\A\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ/
-
-diff --git a/test/test_oauth.rb b/test/test_oauth.rb
-index 445b064..e37a8fa 100644
---- a/test/test_oauth.rb
-+++ b/test/test_oauth.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/extensions/oauth'
- require 'openid/message'
- require 'openid/server'
-@@ -7,7 +7,7 @@ require 'openid/consumer/discovery'
-
- module OpenID
- module OAuthTest
-- class OAuthRequestTestCase < Test::Unit::TestCase
-+ class OAuthRequestTestCase < Minitest::Test
- def setup
- @req = OAuth::Request.new
- end
-@@ -92,7 +92,7 @@ module OpenID
-
- end
-
-- class OAuthResponseTestCase < Test::Unit::TestCase
-+ class OAuthResponseTestCase < Minitest::Test
- def setup
- @req = OAuth::Response.new
- end
-diff --git a/test/test_openid_yadis.rb b/test/test_openid_yadis.rb
-index 77ffa2b..6ff9371 100644
---- a/test/test_openid_yadis.rb
-+++ b/test/test_openid_yadis.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/consumer/discovery'
- require 'openid/yadis/services'
-
-@@ -143,7 +143,7 @@ EOF
- end
- end
-
-- class OpenIDYadisTests < Test::Unit::TestCase
-+ class OpenIDYadisTests < Minitest::Test
- def test_openid_yadis
- data = []
-
-diff --git a/test/test_pape.rb b/test/test_pape.rb
-index ddc0ba8..2b9ff03 100644
---- a/test/test_pape.rb
-+++ b/test/test_pape.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/extensions/pape'
- require 'openid/message'
- require 'openid/server'
-@@ -6,7 +6,7 @@ require 'openid/consumer/responses'
-
- module OpenID
- module PAPETest
-- class PapeRequestTestCase < Test::Unit::TestCase
-+ class PapeRequestTestCase < Minitest::Test
- def setup
- @req = PAPE::Request.new
- end
-@@ -103,7 +103,7 @@ module OpenID
-
- end
-
-- class PapeResponseTestCase < Test::Unit::TestCase
-+ class PapeResponseTestCase < Minitest::Test
- def setup
- @req = PAPE::Response.new
- end
-diff --git a/test/test_parsehtml.rb b/test/test_parsehtml.rb
-index d01494a..2d36528 100644
---- a/test/test_parsehtml.rb
-+++ b/test/test_parsehtml.rb
-@@ -1,9 +1,9 @@
--require "test/unit"
-+require "minitest/autorun"
- require "testutil"
- require "openid/yadis/parsehtml"
-
- module OpenID
-- class ParseHTMLTestCase < Test::Unit::TestCase
-+ class ParseHTMLTestCase < Minitest::Test
- include OpenID::TestDataMixin
-
- def test_parsehtml
-@@ -27,7 +27,7 @@ module OpenID
- end
-
- # the HTML tokenizer test
-- class TC_TestHTMLTokenizer < Test::Unit::TestCase
-+ class TC_TestHTMLTokenizer < Minitest::Test
- def test_bad_link
- toke = HTMLTokenizer.new("<p><a href=http://bad.com/link>foo</a></p>")
- assert("http://bad.com/link" == toke.getTag("a").attr_hash['href'])
-diff --git a/test/test_responses.rb b/test/test_responses.rb
-index 61a0e4c..a05275b 100644
---- a/test/test_responses.rb
-+++ b/test/test_responses.rb
-@@ -1,11 +1,11 @@
--require "test/unit"
-+require "minitest/autorun"
- require "openid/consumer/discovery"
- require "openid/consumer/responses"
-
- module OpenID
- class Consumer
- module TestResponses
-- class TestSuccessResponse < Test::Unit::TestCase
-+ class TestSuccessResponse < Minitest::Test
- def setup
- @endpoint = OpenIDServiceEndpoint.new
- @endpoint.claimed_id = 'identity_url'
-diff --git a/test/test_server.rb b/test/test_server.rb
-index 368b8a7..4ec3b22 100644
---- a/test/test_server.rb
-+++ b/test/test_server.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'testutil'
- require 'util'
- require 'uri'
-@@ -39,7 +39,7 @@ module OpenID
- end
- end
-
-- class TestProtocolError < Test::Unit::TestCase
-+ class TestProtocolError < Minitest::Test
- def test_browserWithReturnTo
- return_to = "http://rp.unittest/consumer"
- # will be a ProtocolError raised by Decode or
-@@ -151,7 +151,7 @@ module OpenID
- end
- end
-
-- class TestDecode < Test::Unit::TestCase
-+ class TestDecode < Minitest::Test
- def setup
- @claimed_id = 'http://de.legating.de.coder.unittest/'
- @id_url = "http://decoder.am.unittest/"
-@@ -175,7 +175,7 @@ module OpenID
- 'pony' => 'spotted',
- 'sreg.mutant_power' => 'decaffinator',
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -185,7 +185,7 @@ module OpenID
- 'openid.mode' => 'twos-compliment',
- 'openid.pants' => 'zippered',
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -242,7 +242,7 @@ module OpenID
- 'openid.claimed_id' => @id_url,
- 'openid.assoc_handle' => @assoc_handle,
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- m = Message.from_post_args(args)
- Server::CheckIDRequest.from_message(m, @op_endpoint)
- }
-@@ -333,7 +333,7 @@ module OpenID
- 'openid.return_to' => @rt_url,
- 'openid.realm' => @tr_url,
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -364,7 +364,7 @@ module OpenID
- 'openid.assoc_handle' => @assoc_handle,
- 'openid.trust_root' => @tr_url,
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -385,15 +385,15 @@ module OpenID
- req = @decode.call(args)
- assert(req.is_a?(Server::CheckIDRequest))
-
-- assert_raise(Server::NoReturnToError) {
-+ assert_raises(Server::NoReturnToError) {
- req.answer(false)
- }
-
-- assert_raise(Server::NoReturnToError) {
-+ assert_raises(Server::NoReturnToError) {
- req.encode_to_url('bogus')
- }
-
-- assert_raise(Server::NoReturnToError) {
-+ assert_raises(Server::NoReturnToError) {
- req.cancel_url
- }
- end
-@@ -408,7 +408,7 @@ module OpenID
- 'openid.identity' => @id_url,
- 'openid.assoc_handle' => @assoc_handle,
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -447,7 +447,7 @@ module OpenID
- end
-
- def test_checkidSetupUntrustedReturn_Constructor
-- assert_raise(Server::UntrustedReturnURL) {
-+ assert_raises(Server::UntrustedReturnURL) {
- Server::CheckIDRequest.new(@id_url, @rt_url, nil,
- 'http://not-the-return-place.unittest/',
- false, @assoc_handle)
-@@ -455,7 +455,7 @@ module OpenID
- end
-
- def test_checkidSetupMalformedReturnURL_Constructor
-- assert_raise(Server::MalformedReturnURL) {
-+ assert_raises(Server::MalformedReturnURL) {
- Server::CheckIDRequest.new(@id_url, 'bogus://return.url', nil,
- 'http://trustroot.com/',
- false, @assoc_handle)
-@@ -488,7 +488,7 @@ module OpenID
- 'openid.bar' => 'signedval2',
- 'openid.baz' => 'unsigned',
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -531,7 +531,7 @@ module OpenID
- 'openid.session_type' => 'DH-SHA1',
- }
- # Using DH-SHA1 without supplying dh_consumer_public is an error.
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -542,7 +542,7 @@ module OpenID
- 'openid.session_type' => 'DH-SHA1',
- 'openid.dh_consumer_public' => "donkeydonkeydonkey",
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -577,7 +577,7 @@ module OpenID
- 'openid.dh_modulus' => 'pizza',
- 'openid.dh_gen' => 'gnocchi',
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -589,7 +589,7 @@ module OpenID
- 'openid.dh_consumer_public' => "Rzup9265tw==",
- 'openid.dh_modulus' => 'pizza',
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -601,7 +601,7 @@ module OpenID
- 'openid.dh_consumer_public' => "Rzup9265tw==",
- 'openid.dh_gen' => 'pizza',
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -625,7 +625,7 @@ module OpenID
- 'openid.session_type' => 'FLCL6',
- 'openid.dh_consumer_public' => "YQ==\n",
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -646,7 +646,7 @@ module OpenID
- 'openid.session_type' => 'DH-SHA1',
- 'openid.dh_consumer_public' => "my public keeey",
- }
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @decode.call(args)
- }
- end
-@@ -675,7 +675,7 @@ module OpenID
- end
- end
-
-- class TestEncode < Test::Unit::TestCase
-+ class TestEncode < Minitest::Test
- def setup
- @encoder = Server::Encoder.new
- @encode = @encoder.method('encode')
-@@ -906,7 +906,7 @@ module OpenID
- 'openid.identity' => 'http://limu.unittest/',
- })
- e = Server::ProtocolError.new(args, "wet paint")
-- assert_raise(Server::EncodingError) {
-+ assert_raises(Server::EncodingError) {
- @encode.call(e)
- }
- end
-@@ -924,7 +924,7 @@ module OpenID
- end
- end
-
-- class TestSigningEncode < Test::Unit::TestCase
-+ class TestSigningEncode < Minitest::Test
- def setup
- @_dumb_key = Server::Signatory._dumb_key
- @_normal_key = Server::Signatory._normal_key
-@@ -981,7 +981,7 @@ module OpenID
-
- def test_forgotStore
- @encoder.signatory = nil
-- assert_raise(ArgumentError) {
-+ assert_raises(ArgumentError) {
- @encode.call(@response)
- }
- end
-@@ -1019,13 +1019,13 @@ module OpenID
-
- def test_alreadySigned
- @response.fields.set_arg(OPENID_NS, 'sig', 'priorSig==')
-- assert_raise(Server::AlreadySigned) {
-+ assert_raises(Server::AlreadySigned) {
- @encode.call(@response)
- }
- end
- end
-
-- class TestCheckID < Test::Unit::TestCase
-+ class TestCheckID < Minitest::Test
- def setup
- @op_endpoint = 'http://endpoint.unittest/'
- @store = Store::Memory.new()
-@@ -1184,7 +1184,7 @@ module OpenID
- @request.identity = nil
- # XXX - Check on this, I think this behavior is legal in OpenID
- # 2.0?
-- assert_raise(ArgumentError) {
-+ assert_raises(ArgumentError) {
- @request.answer(true, nil, "=V")
- }
- end
-@@ -1198,7 +1198,7 @@ module OpenID
-
- def test_answerAllowWithNoIdentity
- @request.identity = IDENTIFIER_SELECT
-- assert_raise(ArgumentError) {
-+ assert_raises(ArgumentError) {
- @request.answer(true, nil, nil)
- }
- end
-@@ -1225,7 +1225,7 @@ module OpenID
- @request.mode = 'checkid_immediate'
- @request.op_endpoint = nil
-
-- assert_raise(ArgumentError) {
-+ assert_raises(ArgumentError) {
- @request.answer(false)
- }
- end
-@@ -1272,7 +1272,7 @@ module OpenID
- @request.identity = IDENTIFIER_SELECT
- selected_id = 'http://anon.unittest/9861'
- claimed_id = 'http://monkeyhat.unittest/'
-- assert_raise(Server::VersionError) {
-+ assert_raises(Server::VersionError) {
- @request.answer(true, nil, selected_id, claimed_id)
- }
- end
-@@ -1280,7 +1280,7 @@ module OpenID
- def test_answerAllowWithAnotherIdentity
- # XXX - Check on this, I think this behavior is legal in OpenID
- # 2.0?
-- assert_raise(ArgumentError){
-+ assert_raises(ArgumentError){
- @request.answer(true, nil, "http://pebbles.unittest/")
- }
- end
-@@ -1288,14 +1288,14 @@ module OpenID
- def test_answerAllowNoIdentityOpenID1
- @request.message = Message.new(OPENID1_NS)
- @request.identity = nil
-- assert_raise(ArgumentError) {
-+ assert_raises(ArgumentError) {
- @request.answer(true, nil, nil)
- }
- end
-
- def test_answerAllowForgotEndpoint
- @request.op_endpoint = nil
-- assert_raise(RuntimeError) {
-+ assert_raises(RuntimeError) {
- @request.answer(true)
- }
- end
-@@ -1307,7 +1307,7 @@ module OpenID
- msg.set_arg(OPENID_NS, 'mode', 'checkid_setup')
- msg.set_arg(OPENID_NS, 'assoc_handle', 'bogus')
-
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- Server::CheckIDRequest.from_message(msg, @server)
- }
- end
-@@ -1318,7 +1318,7 @@ module OpenID
- msg.set_arg(OPENID_NS, 'return_to', 'http://invalid:8000/rt')
- msg.set_arg(OPENID_NS, 'claimed_id', 'https://example.myopenid.com')
-
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- Server::CheckIDRequest.from_message(msg, @server)
- }
- end
-@@ -1329,7 +1329,7 @@ module OpenID
- msg.set_arg(OPENID_NS, 'return_to', 'http://invalid:8000/rt')
- msg.set_arg(OPENID_NS, 'identity', 'https://example.myopenid.com')
-
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- Server::CheckIDRequest.from_message(msg, @server)
- }
- end
-@@ -1466,7 +1466,7 @@ module OpenID
- def test_getCancelURLimmed
- @request.mode = 'checkid_immediate'
- @request.immediate = true
-- assert_raise(ArgumentError) {
-+ assert_raises(ArgumentError) {
- @request.cancel_url
- }
- end
-@@ -1497,7 +1497,7 @@ module OpenID
- end
- end
-
-- class TestCheckIDExtension < Test::Unit::TestCase
-+ class TestCheckIDExtension < Minitest::Test
-
- def setup
- @op_endpoint = 'http://endpoint.unittest/ext'
-@@ -1574,7 +1574,7 @@ module OpenID
- end
- end
-
-- class TestCheckAuth < Test::Unit::TestCase
-+ class TestCheckAuth < Minitest::Test
- def setup
- @assoc_handle = 'mooooooooo'
- @message = Message.from_post_args({
-@@ -1644,7 +1644,7 @@ module OpenID
- end
- end
-
-- class TestAssociate < Test::Unit::TestCase
-+ class TestAssociate < Minitest::Test
- # TODO: test DH with non-default values for modulus and gen.
- # (important to do because we actually had it broken for a while.)
-
-@@ -1720,7 +1720,7 @@ module OpenID
-
- bad_request_argss.each { |request_args|
- message = Message.from_post_args(request_args)
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- Server::AssociateRequest.from_message(message)
- }
- }
-@@ -1745,7 +1745,7 @@ module OpenID
-
- bad_request_argss.each { |request_args|
- message = Message.from_post_args(request_args)
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- Server::AssociateRequest.from_message(message)
- }
- }
-@@ -1906,7 +1906,7 @@ module OpenID
- # the request was an OpenID 1 request.
- m = Message.new(OPENID1_NS)
-
-- assert_raise(Server::ProtocolError) {
-+ assert_raises(Server::ProtocolError) {
- @request.answer_unsupported(m)
- }
- end
-@@ -1915,7 +1915,7 @@ module OpenID
- class UnhandledError < Exception
- end
-
-- class TestServer < Test::Unit::TestCase
-+ class TestServer < Minitest::Test
- include TestUtil
-
- def setup
-@@ -1928,7 +1928,7 @@ module OpenID
- request = Server::OpenIDRequest.new()
- request.mode = "monkeymode"
- request.message = Message.new(OPENID1_NS)
-- assert_raise(RuntimeError) {
-+ assert_raises(RuntimeError) {
- @server.handle_request(request)
- }
- end
-@@ -1952,7 +1952,7 @@ module OpenID
- request = Server::OpenIDRequest.new()
- request.mode = "monkeymode"
- request.message = Message.new(OPENID1_NS)
-- assert_raise(UnhandledError) {
-+ assert_raises(UnhandledError) {
- @server.handle_request(request)
- }
- end
-@@ -2071,7 +2071,7 @@ module OpenID
- attr_accessor :assoc_handle, :namespace
- end
-
-- class TestSignatory < Test::Unit::TestCase
-+ class TestSignatory < Minitest::Test
- include TestUtil
-
- def setup
-@@ -2393,7 +2393,7 @@ module OpenID
- end
- end
-
-- class RunthroughTestCase < Test::Unit::TestCase
-+ class RunthroughTestCase < Minitest::Test
- def setup
- @store = Store::Memory.new
- @server = Server::Server.new(@store, "http://example.com/openid/server")
-diff --git a/test/test_sreg.rb b/test/test_sreg.rb
-index ebafe18..d7790ca 100644
---- a/test/test_sreg.rb
-+++ b/test/test_sreg.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/extensions/sreg'
- require 'openid/message'
- require 'openid/server'
-@@ -17,7 +17,7 @@ module OpenID
- 'language'=>'en-us',
- }
-
-- class SRegTest < Test::Unit::TestCase
-+ class SRegTest < Minitest::Test
-
- def test_is11
- assert_equal(NS_URI, NS_URI_1_1)
-@@ -78,7 +78,7 @@ module OpenID
-
- end
-
-- class GetNSTest < Test::Unit::TestCase
-+ class GetNSTest < Minitest::Test
- def setup
- @msg = FakeMessage.new
- end
-@@ -149,7 +149,7 @@ module OpenID
-
- end
-
-- class SRegRequestTest < Test::Unit::TestCase
-+ class SRegRequestTest < Minitest::Test
- def test_construct_empty
- req = Request.new
- assert_equal([], req.optional)
-@@ -413,7 +413,7 @@ module OpenID
- end
-
-
-- class SRegResponseTest < Test::Unit::TestCase
-+ class SRegResponseTest < Minitest::Test
- def test_construct
- resp = Response.new(SOME_DATA)
- assert_equal(SOME_DATA, resp.get_extension_args)
-@@ -444,7 +444,7 @@ module OpenID
- end
- end
-
-- class SendFieldsTest < Test::Unit::TestCase
-+ class SendFieldsTest < Minitest::Test
- # class SendFieldsTest < Object
- def test_send_fields
- # create a request message with simple reg fields
-diff --git a/test/test_stores.rb b/test/test_stores.rb
-index 6c7b910..be42a84 100644
---- a/test/test_stores.rb
-+++ b/test/test_stores.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/store/interface'
- require 'openid/store/filesystem'
- require 'openid/store/memcache'
-@@ -214,7 +214,7 @@ module OpenID
- end
- end
-
-- class FileStoreTestCase < Test::Unit::TestCase
-+ class FileStoreTestCase < Minitest::Test
- include StoreTestCase
-
- def setup
-@@ -227,7 +227,7 @@ module OpenID
- end
- end
-
-- class MemoryStoreTestCase < Test::Unit::TestCase
-+ class MemoryStoreTestCase < Minitest::Test
- include StoreTestCase
-
- def setup
-@@ -239,7 +239,7 @@ module OpenID
- ::TESTING_MEMCACHE
- rescue NameError
- else
-- class MemcacheStoreTestCase < Test::Unit::TestCase
-+ class MemcacheStoreTestCase < Minitest::Test
- include StoreTestCase
- def setup
- store_uniq = OpenID::CryptUtil.random_string(6, "0123456789")
-@@ -255,38 +255,38 @@ module OpenID
- end
- end
-
-- class AbstractStoreTestCase < Test::Unit::TestCase
-+ class AbstractStoreTestCase < Minitest::Test
- def test_abstract_class
- # the abstract made concrete
- abc = Interface.new()
- server_url = "http://server.com/"
- association = OpenID::Association.new("foo", "bar", Time.now, Time.now + 10, "dummy")
-
-- assert_raise(NotImplementedError) {
-+ assert_raises(NotImplementedError) {
- abc.store_association(server_url, association)
- }
-
-- assert_raise(NotImplementedError) {
-+ assert_raises(NotImplementedError) {
- abc.get_association(server_url)
- }
-
-- assert_raise(NotImplementedError) {
-+ assert_raises(NotImplementedError) {
- abc.remove_association(server_url, association.handle)
- }
-
-- assert_raise(NotImplementedError) {
-+ assert_raises(NotImplementedError) {
- abc.use_nonce(server_url, Time.now.to_i, "foo")
- }
-
-- assert_raise(NotImplementedError) {
-+ assert_raises(NotImplementedError) {
- abc.cleanup_nonces()
- }
-
-- assert_raise(NotImplementedError) {
-+ assert_raises(NotImplementedError) {
- abc.cleanup_associations()
- }
-
-- assert_raise(NotImplementedError) {
-+ assert_raises(NotImplementedError) {
- abc.cleanup()
- }
-
-diff --git a/test/test_trustroot.rb b/test/test_trustroot.rb
-index 85b465c..5baa1bb 100644
---- a/test/test_trustroot.rb
-+++ b/test/test_trustroot.rb
-@@ -1,8 +1,8 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'testutil'
- require 'openid/trustroot'
-
--class TrustRootTest < Test::Unit::TestCase
-+class TrustRootTest < Minitest::Test
- include OpenID::TestDataMixin
-
- def _test_sanity(case_, sanity, desc)
-diff --git a/test/test_ui.rb b/test/test_ui.rb
-index e20227a..e7a6821 100644
---- a/test/test_ui.rb
-+++ b/test/test_ui.rb
-@@ -1,11 +1,11 @@
- require 'openid/extensions/ui'
- require 'openid/message'
- require 'openid/server'
--require 'test/unit'
-+require 'minitest/autorun'
-
- module OpenID
- module UITest
-- class UIRequestTestCase < Test::Unit::TestCase
-+ class UIRequestTestCase < Minitest::Test
-
- def setup
- @req = UI::Request.new
-diff --git a/test/test_urinorm.rb b/test/test_urinorm.rb
-index 34f97cb..9f6597e 100644
---- a/test/test_urinorm.rb
-+++ b/test/test_urinorm.rb
-@@ -1,8 +1,8 @@
--require "test/unit"
-+require "minitest/autorun"
- require "testutil"
- require "openid/urinorm"
-
--class URINormTestCase < Test::Unit::TestCase
-+class URINormTestCase < Minitest::Test
- include OpenID::TestDataMixin
-
- def test_normalize
-diff --git a/test/test_util.rb b/test/test_util.rb
-index b9a82b7..52c1fb0 100644
---- a/test/test_util.rb
-+++ b/test/test_util.rb
-@@ -1,9 +1,9 @@
- # encoding: ASCII-8BIT
--require "test/unit"
-+require "minitest/autorun"
- require "openid/util"
-
- module OpenID
-- class UtilTestCase < Test::Unit::TestCase
-+ class UtilTestCase < Minitest::Test
-
- def test_base64
- cases = [
-diff --git a/test/test_xrds.rb b/test/test_xrds.rb
-index 57ad656..595af1f 100644
---- a/test/test_xrds.rb
-+++ b/test/test_xrds.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'testutil'
- require 'openid/yadis/xrds'
-
-@@ -19,24 +19,24 @@ module OpenID
- end
- end
-
-- class ParseXRDSTestCase < Test::Unit::TestCase
-+ class ParseXRDSTestCase < Minitest::Test
- include XRDSTestMixin
-
- # Check that parsing succeeds at all.
- def test_parse
- result = Yadis.parseXRDS(read_xrds_data_file(XRD_FILE))
-- assert_not_nil result
-+ refute_nil result
- end
-
- def test_parse_no_xrds_xml
- xmldoc = read_xrds_data_file(NOXRDS_FILE)
-- assert_raise(Yadis::XRDSError) {
-+ assert_raises(Yadis::XRDSError) {
- Yadis.parseXRDS(xmldoc)
- }
- end
-
- def test_parse_no_xrds_empty
-- assert_raise(Yadis::XRDSError) {
-+ assert_raises(Yadis::XRDSError) {
- Yadis.parseXRDS('')
- }
- end
-@@ -49,14 +49,14 @@ module OpenID
- end
- end
-
-- class GetYadisXRDTestCase < Test::Unit::TestCase
-+ class GetYadisXRDTestCase < Minitest::Test
- include XRDSTestMixin
-
- # XXX: Test to make sure this really gets the _right_ XRD.
- def test_get_xrd
- doc = Yadis.parseXRDS(read_xrds_data_file(XRD_FILE))
- result = Yadis::get_yadis_xrd(doc)
-- assert_not_nil result
-+ refute_nil result
- assert_equal 'XRD', result.name
- assert_equal Yadis::XRD_NS_2_0, result.namespace
- end
-@@ -64,13 +64,13 @@ module OpenID
- def test_no_xrd
- xmldoc = read_xrds_data_file(NOXRD_FILE)
- doc = Yadis.parseXRDS(xmldoc)
-- assert_raise(Yadis::XRDSError) {
-+ assert_raises(Yadis::XRDSError) {
- Yadis.get_yadis_xrd(doc)
- }
- end
- end
-
-- class EachServiceTestCase < Test::Unit::TestCase
-+ class EachServiceTestCase < Minitest::Test
- include XRDSTestMixin
-
- def test_get_xrd
-@@ -80,14 +80,14 @@ module OpenID
- assert_equal 'Service', e.name
- count += 1
- }
-- assert_not_nil result
-+ refute_nil result
- assert_equal 5, count
- end
-
- def test_no_xrd
- xmldoc = read_xrds_data_file(NOXRD_FILE)
- doc = Yadis.parseXRDS(xmldoc)
-- assert_raise(Yadis::XRDSError) {
-+ assert_raises(Yadis::XRDSError) {
- Yadis.each_service(doc)
- }
- end
-@@ -99,14 +99,14 @@ module OpenID
- assert_equal 'Service', e.name
- count += 1
- }
-- assert_not_nil result
-+ refute_nil result
- assert_equal 2, count
- end
- end
-
- # XXX: test prioSort!
-
-- class ExpandServiceTestCase < Test::Unit::TestCase
-+ class ExpandServiceTestCase < Minitest::Test
- @@service_xml = <<END
- <Service>
- <Type>urn://foo</Type>
-@@ -133,7 +133,7 @@ END
- end
- end
-
-- class PrioSortTestCase < Test::Unit::TestCase
-+ class PrioSortTestCase < Minitest::Test
- def new_uri(priority)
- e = REXML::Element.new("URI")
- e.add_attribute("priority", priority.to_s) unless e.nil?
-@@ -155,7 +155,7 @@ END
- end
- end
-
-- class GetCanonicalIDTestCase < Test::Unit::TestCase
-+ class GetCanonicalIDTestCase < Minitest::Test
- include XRDSTestMixin
-
- def test_multisegment_xri
-diff --git a/test/test_xri.rb b/test/test_xri.rb
-index ba20e9c..f6775f7 100644
---- a/test/test_xri.rb
-+++ b/test/test_xri.rb
-@@ -1,11 +1,11 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/yadis/xri'
-
- module OpenID
-
- module Yadis
-
-- class XriDiscoveryTestCase < Test::Unit::TestCase
-+ class XriDiscoveryTestCase < Minitest::Test
-
- def test_isXRI?
- assert_equal(:xri, XRI.identifier_scheme('=john.smith'))
-@@ -18,7 +18,7 @@ module OpenID
- end
- end
-
-- class XriEscapingTestCase < Test::Unit::TestCase
-+ class XriEscapingTestCase < Minitest::Test
- def test_escaping_percents
- assert_equal('@example/abc%252Fd/ef',
- XRI.escape_for_iri('@example/abc%2Fd/ef'))
-@@ -37,7 +37,7 @@ module OpenID
- end
- end
-
-- class XriTransformationTestCase < Test::Unit::TestCase
-+ class XriTransformationTestCase < Minitest::Test
- def test_to_iri_normal
- assert_equal('xri://@example', XRI.to_iri_normal('@example'))
- end
-diff --git a/test/test_xrires.rb b/test/test_xrires.rb
-index 6db1bdf..a08f2cb 100644
---- a/test/test_xrires.rb
-+++ b/test/test_xrires.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'openid/yadis/xrires'
-
- module OpenID
-@@ -18,7 +18,7 @@ module OpenID
- end
- end
-
-- class ProxyQueryTestCase < Test::Unit::TestCase
-+ class ProxyQueryTestCase < Minitest::Test
- def setup
- @proxy_url = 'http://xri.example.com/'
- @proxy = XRI::ProxyResolver.new(@proxy_url)
-diff --git a/test/test_yadis_discovery.rb b/test/test_yadis_discovery.rb
-index 7f28e07..0b83879 100644
---- a/test/test_yadis_discovery.rb
-+++ b/test/test_yadis_discovery.rb
-@@ -1,4 +1,4 @@
--require 'test/unit'
-+require 'minitest/autorun'
- require 'testutil'
- require 'uri'
- require 'openid/yadis/discovery'
-@@ -78,12 +78,12 @@ module OpenID
- end
- end
-
-- class TestSecondGet < Test::Unit::TestCase
-+ class TestSecondGet < Minitest::Test
- include FetcherMixin
-
- def test_404
- uri = "http://something.unittest/"
-- assert_raise(DiscoveryFailure) {
-+ assert_raises(DiscoveryFailure) {
- with_fetcher(MockFetcher.new) { Yadis.discover(uri) }
- }
- end
-@@ -120,7 +120,7 @@ module OpenID
- setup
-
- if @expected.respond_to?("ancestors") and @expected.ancestors.member?(DiscoveryFailure)
-- @testcase.assert_raise(DiscoveryFailure) {
-+ @testcase.assert_raises(DiscoveryFailure) {
- do_discovery
- }
- else
-@@ -164,7 +164,7 @@ module OpenID
- end
- end
-
-- class TestYadisDiscovery < Test::Unit::TestCase
-+ class TestYadisDiscovery < Minitest::Test
- include FetcherMixin
-
- def test_yadis_discovery
---
-1.9.3
-
diff --git a/rubygem-ruby-openid-2.6.0-skip-failure.patch b/rubygem-ruby-openid-2.6.0-skip-failure.patch
deleted file mode 100644
index 4379917..0000000
--- a/rubygem-ruby-openid-2.6.0-skip-failure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 733398105041e49334500160b3aaa4ddb10a767f Mon Sep 17 00:00:00 2001
-From: Ken Dreyer <ktdreyer at ktdreyer.com>
-Date: Sat, 8 Nov 2014 19:51:19 -0700
-Subject: [PATCH] Fedora: tests: skip failing redirect limit test
-
-This test fails for an unknown reason. Skip it.
----
- test/test_fetchers.rb | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/test/test_fetchers.rb b/test/test_fetchers.rb
-index 452a928..b252043 100644
---- a/test/test_fetchers.rb
-+++ b/test/test_fetchers.rb
-@@ -241,6 +241,13 @@ EOHTML
- end
-
- def test_redirect_limit
-+ # This test fails during the Fedora package build.
-+ # [OpenID::HTTPRedirectLimitReached] exception expected, not
-+ # Class: <OpenID::FetchingError>
-+ # Message: <"Error fetching http://localhost:42083/redirect_loop:
-+ # undefined method `bytesize' for 0:Fixnum">
-+ #
-+ skip "Fedora only: skip this"
- @_redirect_counter = 0
- uri = _uri_build('/redirect_loop')
- assert_raises(OpenID::HTTPRedirectLimitReached) {
---
-1.9.3
-
diff --git a/rubygem-ruby-openid.spec b/rubygem-ruby-openid.spec
index 428bb2f..5f36966 100644
--- a/rubygem-ruby-openid.spec
+++ b/rubygem-ruby-openid.spec
@@ -1,7 +1,7 @@
%global gem_name ruby-openid
Name: rubygem-%{gem_name}
-Version: 2.6.0
+Version: 2.7.0
Release: 1%{?dist}
Summary: A library for consuming and serving OpenID identities
Group: Development/Languages
@@ -15,12 +15,7 @@ Group: Development/Languages
License: Ruby and ASL 2.0 and MIT
URL: https://github.com/openid/ruby-openid
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# Not yet submitted upstream
-Patch0: rubygem-ruby-openid-2.6.0-minitest.patch
-# This patch skips the test_redirect_limit failure. The cause of the test
-# failure is unknown.
-Patch1: rubygem-ruby-openid-2.6.0-skip-failure.patch
-%if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
+%if 0%{?fc20} || 0%{?el7}
Requires: ruby(release)
Requires: ruby(rubygems)
%endif
@@ -28,12 +23,12 @@ BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: rubygem(minitest)
BuildArch: noarch
-%if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
+%if 0%{?fc20} || 0%{?el7}
Provides: rubygem(%{gem_name}) = %{version}
%endif
# This package was renamed from "ruby-openid".
# Provide the necessary compatibility bits on older Fedoras.
-%if 0%{?fc19} || 0%{?fc20} || 0%{?fc21}
+%if 0%{?fc20} || 0%{?fc21}
Provides: ruby-openid = %{version}-%{release}
Provides: ruby(openid) = %{version}-%{release}
Obsoletes: ruby-openid <= 2.1.7-11
@@ -76,11 +71,6 @@ done
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-# Update test suite to Minitest 5
-%patch0 -p1
-# Skip the redirect_limit test that fails
-%patch1 -p1
-
%build
# Create the gem as gem install only works on a gem file
gem build %{gem_name}.gemspec
@@ -89,8 +79,8 @@ gem build %{gem_name}.gemspec
%install
mkdir -p %{buildroot}%{gem_dir}
-cp -pa .%{gem_dir}/* \
- %{buildroot}%{gem_dir}/
+cp -a .%{gem_dir}/* \
+ %{buildroot}%{gem_dir}/
%check
# https://github.com/openid/ruby-openid/issues/60
@@ -120,6 +110,11 @@ popd
%changelog
+* Mon Apr 13 2015 Ken Dreyer <ktdreyer at ktdreyer.com> - 2.7.0-1
+- Update to ruby-openid 2.7.0 (RHBZ #1199116)
+- Drop upstreamed patches
+- Drop Fedora 19 support
+
* Sat Nov 01 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 2.6.0-1
- Update to ruby-openid 2.6.0 (RHBZ #1159536)
- Update for Minitest 5 (RHBZ #1107226)
diff --git a/sources b/sources
index de1f789..675d45a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c02f4dbf316cc3ec47a09cacac4bf6a ruby-openid-2.6.0.gem
+e387ad8850a87af7c583deb450a060d6 ruby-openid-2.7.0.gem
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/rubygem-ruby-openid.git/commit/?h=master&id=5dd0c09314c7872a4d1d505688e5253798b8bbd1
More information about the scm-commits
mailing list