use Utils.normalize_path() for Stubs

lib/faraday/adapter/test.rb

@@ -32,7 +32,6 @@ def match(request_method, path, headers, body)
           return false if !@stack.key?(request_method)
           stack = @stack[request_method]
           consumed = (@consumed[request_method] ||= [])
-          path = normalize_path(path)
 
           if stub = matches?(stack, path, headers, body)
             consumed << stack.delete(stub)
@@ -86,20 +85,13 @@ def verify_stubbed_calls
         protected
 
         def new_stub(request_method, path, headers = {}, body=nil, &block)
-          (@stack[request_method] ||= []) << Stub.new(normalize_path(path), headers, body, block)
+          normalized_path = Faraday::Utils.normalize_path(path)
+          (@stack[request_method] ||= []) << Stub.new(normalized_path, headers, body, block)
         end
 
         def matches?(stack, path, headers, body)
           stack.detect { |stub| stub.matches?(path, headers, body) }
         end
-
-        # ensure leading + trailing slash
-        def normalize_path(path)
-          path = '/' + path if path.index('/') != 0
-          path = path.sub('?', '/?')
-          path = path + '/' unless $&
-          path.gsub('//', '/')
-        end
       end
 
       class Stub < Struct.new(:path, :params, :headers, :body, :block)

lib/faraday/utils.rb

@@ -236,9 +236,10 @@ def URI(url)
       end
     end
 
-    # Receives a URL and returns just the path with the query string sorted.
+    # Receives a String or URI and returns just the path with the query string sorted.
     def normalize_path(url)
-      (url.path != "" ? url.path : "/") +
+      url = URI(url)
+      (url.path.start_with?('/') ? url.path : '/' + url.path) +
       (url.query ? "?#{sort_query_params(url.query)}" : "")
     end