ruby-openid 2.6.0 → 2.7.0

data/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

data/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()
         }
 

data/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)

data/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

data/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

data/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 = [

data/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

data/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

data/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)

data/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

data/test/testutil.rb

@@ -1,5 +1,12 @@
 require "pathname"
 
+if defined? Minitest::Test
+  # We're on Minitest 5+. Nothing to do here.
+else
+  # Minitest 4 doesn't have Minitest::Test yet.
+  Minitest::Test = MiniTest::Unit::TestCase
+end
+
 module OpenID
   module TestDataMixin
     TESTS_DIR = Pathname.new(__FILE__).dirname
@@ -52,7 +59,7 @@ module OpenID
       rescue ProtocolError => why
         message = "Expected prefix #{str_prefix.inspect}, got "\
                   "#{why.message.inspect}"
-        assert(why.message.starts_with?(str_prefix), message)
+        assert(why.message.start_with?(str_prefix), message)
       else
         fail("Expected ProtocolError. Got #{result.inspect}")
       end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby-openid
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - JanRain, Inc
 autorequire: openid
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
-dependencies: []
+date: 2015-03-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
 description: 
 email: openid@janrain.com
 executables: []
@@ -117,7 +131,6 @@ files:
 - lib/openid/extensions/pape.rb
 - lib/openid/extensions/sreg.rb
 - lib/openid/extensions/ui.rb
-- lib/openid/extras.rb
 - lib/openid/fetchers.rb
 - lib/openid/kvform.rb
 - lib/openid/kvpost.rb
@@ -199,7 +212,6 @@ files:
 - test/test_discover.rb
 - test/test_discovery_manager.rb
 - test/test_extension.rb
-- test/test_extras.rb
 - test/test_fetchers.rb
 - test/test_filters.rb
 - test/test_idres.rb
@@ -249,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A library for consuming and serving OpenID identities.
@@ -310,7 +322,6 @@ test_files:
 - test/test_discover.rb
 - test/test_discovery_manager.rb
 - test/test_extension.rb
-- test/test_extras.rb
 - test/test_fetchers.rb
 - test/test_filters.rb
 - test/test_idres.rb