Fixing tests

lib/openid/trustroot.rb

@@ -178,7 +178,7 @@ def TrustRoot._parse_url(url)
         end
 
         begin
-          parsed = URI::parse(url)
+          parsed = URI::DEFAULT_PARSER.parse(url)
         rescue URI::InvalidURIError
           return nil
         end

test/test_association.rb

@@ -1,5 +1,6 @@
 require "minitest/autorun"
 require "openid/association"
+require "openid/protocolerror"
 
 module OpenID
   class AssociationTestCase < Minitest::Test

test/test_associationmanager.rb

@@ -1,10 +1,12 @@
 require "minitest/autorun"
+require "testutil"
 require "openid/consumer/associationmanager"
 require "openid/association"
 require "openid/dh"
 require "openid/util"
 require "openid/cryptutil"
 require "openid/message"
+require "openid/protocolerror"
 require "openid/store/memory"
 require "util"
 require "time"

test/test_discover.rb

@@ -746,13 +746,9 @@ 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
       # once.
-      discoverXRI = Proc.new { |identifier|
-        return 'XRI'
-      }
+      discoverXRI = Proc.new { |identifier| 'XRI' }
 
-      discoverURI = Proc.new { |identifier|
-        return 'URI'
-      }
+      discoverURI = Proc.new { |identifier| 'URI' }
 
       OpenID.extend(OverrideMethodMixin)
 

test/test_discovery_manager.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'openid/consumer/discovery_manager'
+require 'openid/consumer'
 require 'testutil'
 
 module OpenID

test/test_pape.rb

@@ -2,7 +2,7 @@
 require 'openid/extensions/pape'
 require 'openid/message'
 require 'openid/server'
-require 'openid/consumer/responses'
+require 'openid/consumer'
 
 module OpenID
   module PAPETest