Fixed additional cases to accept uris with non-utf-8

bblimke · Sep 27, 2013 · 7525777 · 7525777
1 parent b9b4f36
commit 7525777
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/webmock/util/uri.rb b/lib/webmock/util/uri.rb
@@ -91,11 +91,17 @@ def self.uris_encoded_and_unencoded(uris)
       end
 
       def self.uris_with_scheme_and_without(uris)
-        uris.map { |uri| [ uri, uri.gsub(%r{^https?://},"").freeze ] }.flatten
+        uris.map { |uri|
+          uri = uri.dup.force_encoding(Encoding::ASCII_8BIT) if uri.respond_to?(:force_encoding)
+          [ uri, uri.gsub(%r{^https?://},"").freeze ]
+        }.flatten
       end
 
       def self.uris_with_trailing_slash_and_without(uris)
-        uris = uris.map { |uri| [ uri, uri.omit(:path).freeze ] }.flatten
+        uris = uris.map { |uri|
+          uri = uri.dup.force_encoding(Encoding::ASCII_8BIT) if uri.respond_to?(:force_encoding)
+          [ uri, uri.omit(:path).freeze ]
+        }.flatten
       end
 
     end