webmock 0.7.1 → 0.7.2

data/spec/request_stub_spec.rb

@@ -6,7 +6,7 @@ describe RequestStub do
     @request_stub = RequestStub.new(:get, "www.google.com")
   end
 
-  it "should have request profile with method and url" do
+  it "should have request profile with method and uri" do
     @request_stub.request_profile.method.should == :get
     @request_stub.request_profile.uri.host.should == "www.google.com"
   end
@@ -23,7 +23,7 @@ describe RequestStub do
     end
 
     it "should assign normalized headers to request profile" do
-      Utility.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
+      Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
       @request_stub.with(:headers => {'A' => 'a'})
       @request_stub.request_profile.headers.should == {'B' => 'b'}
     end

data/spec/response_spec.rb

@@ -6,7 +6,7 @@ describe Response do
   end
 
   it "should report normalized headers" do
-    Utility.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
+    Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
     @response.headers.should == {'B' => 'b'}
   end
 

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'webmock'
 require 'spec'
 require 'spec/autorun'
+require 'rubygems'
+
+require 'webmock/rspec'
 
 include WebMock
 
@@ -56,3 +58,4 @@ def setup_expectations_for_real_google_request(options = {})
     :response_body => "<title>Google fake response</title>" }
   setup_expectations_for_real_request(defaults.merge(options))
 end
+

data/spec/util/hash_counter_spec.rb

@@ -1,13 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe HashCounter do
+describe Util::HashCounter do
 
   it "should return 0 for non existing key" do
-    HashCounter.new.get(:abc).should == 0
+    Util::HashCounter.new.get(:abc).should == 0
   end
 
   it "should increase the returned value on every put with the same key" do
-    counter =HashCounter.new
+    counter =Util::HashCounter.new
     counter.put(:abc)
     counter.get(:abc).should == 1
     counter.put(:abc)
@@ -15,7 +15,7 @@ describe HashCounter do
   end
 
   it "should only increase value for given key provided to put" do
-    counter =HashCounter.new
+    counter =Util::HashCounter.new
     counter.put(:abc)
     counter.get(:abc).should == 1
     counter.get(:def).should == 0

data/spec/util/headers_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe WebMock::Util::Headers do
+
+  it "should decode_userinfo_from_header handles basic auth" do
+    authorization_header = "Basic dXNlcm5hbWU6c2VjcmV0"
+    userinfo = Util::Headers.decode_userinfo_from_header(authorization_header)
+    userinfo.should == "username:secret"
+  end
+
+end

data/spec/util/uri_spec.rb

@@ -0,0 +1,213 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+URIS_WITHOUT_PATH_OR_PARAMS =
+[
+  "www.google.com",
+  "www.google.com/",
+  "www.google.com:80",
+  "www.google.com:80/",
+  "http://www.google.com",
+  "http://www.google.com/",
+  "http://www.google.com:80",
+  "http://www.google.com:80/"
+].sort
+
+URIS_WITH_AUTH =
+[
+  "a b:pass@www.google.com",
+  "a b:pass@www.google.com/",
+  "a b:pass@www.google.com:80",
+  "a b:pass@www.google.com:80/",
+  "http://a b:pass@www.google.com",
+  "http://a b:pass@www.google.com/",
+  "http://a b:pass@www.google.com:80",
+  "http://a b:pass@www.google.com:80/",
+  "a%20b:pass@www.google.com",
+  "a%20b:pass@www.google.com/",
+  "a%20b:pass@www.google.com:80",
+  "a%20b:pass@www.google.com:80/",
+  "http://a%20b:pass@www.google.com",
+  "http://a%20b:pass@www.google.com/",
+  "http://a%20b:pass@www.google.com:80",
+  "http://a%20b:pass@www.google.com:80/"
+].sort
+
+URIS_WITH_PATH_AND_PARAMS =
+[
+  "www.google.com/big image.jpg/?a=big image&b=c",
+  "www.google.com/big%20image.jpg/?a=big%20image&b=c",
+  "www.google.com:80/big image.jpg/?a=big image&b=c",
+  "www.google.com:80/big%20image.jpg/?a=big%20image&b=c",
+  "http://www.google.com/big image.jpg/?a=big image&b=c",
+  "http://www.google.com/big%20image.jpg/?a=big%20image&b=c",
+  "http://www.google.com:80/big image.jpg/?a=big image&b=c",
+  "http://www.google.com:80/big%20image.jpg/?a=big%20image&b=c",
+  ].sort
+
+URIS_WITH_DIFFERENT_PORT =
+[
+  "www.google.com:88",
+  "www.google.com:88/",
+  "http://www.google.com:88",
+  "http://www.google.com:88/"
+].sort
+
+URIS_FOR_HTTPS =
+[
+  "https://www.google.com",
+  "https://www.google.com/",
+  "https://www.google.com:443",
+  "https://www.google.com:443/"
+].sort
+
+
+describe WebMock::Util::URI do
+
+  describe "reporting variations of uri" do
+
+    it "should find all variations of the same uri for all variations of uri with params and path" do
+      URIS_WITH_PATH_AND_PARAMS.each do |uri|
+        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_WITH_PATH_AND_PARAMS
+      end
+    end
+
+    it "should find all variations of the same uri for all variations of uri without params or path" do
+      URIS_WITHOUT_PATH_OR_PARAMS.each do |uri|
+        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_WITHOUT_PATH_OR_PARAMS
+      end
+    end
+
+    it "should find all variations of the same uri for all variations of uri with auth" do
+      URIS_WITH_AUTH.each do |uri|
+        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_WITH_AUTH
+      end
+    end
+
+    it "should find all variations of the same uri for all variations of uri with different port" do
+      URIS_WITH_DIFFERENT_PORT.each do |uri|
+        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_WITH_DIFFERENT_PORT
+      end
+    end
+
+    it "should find all variations of the same uri for all variations of https uris" do
+      URIS_FOR_HTTPS.each do |uri|
+        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_FOR_HTTPS
+      end
+    end
+
+  end
+
+  describe "normalized uri equality" do
+
+    it "should successfully compare all variations of the same uri with path and params" do
+      URIS_WITH_PATH_AND_PARAMS.each do |uri_a|
+        URIS_WITH_PATH_AND_PARAMS.each do |uri_b|
+          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+        end
+      end
+    end
+
+    it "should successfully compare all variations of the same uri without path or params" do
+      URIS_WITHOUT_PATH_OR_PARAMS.each do |uri_a|
+        URIS_WITHOUT_PATH_OR_PARAMS.each do |uri_b|
+          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+        end
+      end
+    end
+
+    it "should successfully compare all variations of the same uri with authority" do
+      URIS_WITH_AUTH.each do |uri_a|
+        URIS_WITH_AUTH.each do |uri_b|
+          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+        end
+      end
+    end
+
+    it "should successfully compare all variations of the same uri custom port" do
+      URIS_WITH_DIFFERENT_PORT.each do |uri_a|
+        URIS_WITH_DIFFERENT_PORT.each do |uri_b|
+          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+        end
+      end
+    end
+
+    it "should successfully compare all variations of the same https uri" do
+      URIS_FOR_HTTPS.each do |uri_a|
+        URIS_FOR_HTTPS.each do |uri_b|
+          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+        end
+      end
+    end
+
+  end
+
+  describe "stripping default port" do
+
+    it "should strip_default_port_from_uri strips 80 from http with path" do
+      uri = "http://example.com:80/foo/bar"
+      stripped_uri = WebMock::Util::URI.strip_default_port_from_uri_string(uri)
+      stripped_uri.should ==  "http://example.com/foo/bar"
+    end
+
+    it "should strip_default_port_from_uri strips 80 from http without path" do
+      uri = "http://example.com:80"
+      stripped_uri = WebMock::Util::URI.strip_default_port_from_uri_string(uri)
+      stripped_uri.should ==  "http://example.com"
+    end
+
+    it "should strip_default_port_from_uri strips 443 from https without path" do
+      uri = "https://example.com:443"
+      stripped_uri = WebMock::Util::URI.strip_default_port_from_uri_string(uri)
+      stripped_uri.should ==  "https://example.com"
+    end
+
+    it "should strip_default_port_from_uri strips 443 from https" do
+      uri = "https://example.com:443/foo/bar"
+      stripped_uri = WebMock::Util::URI.strip_default_port_from_uri_string(uri)
+      stripped_uri.should == "https://example.com/foo/bar"
+    end
+
+    it "should strip_default_port_from_uri does not strip 8080 from http" do
+      uri = "http://example.com:8080/foo/bar"
+      WebMock::Util::URI.strip_default_port_from_uri_string(uri).should == uri
+    end
+
+    it "should strip_default_port_from_uri does not strip 443 from http" do
+      uri = "http://example.com:443/foo/bar"
+      WebMock::Util::URI.strip_default_port_from_uri_string(uri).should == uri
+    end
+
+    it "should strip_default_port_from_uri does not strip 80 from query string" do
+      uri = "http://example.com/?a=:80&b=c"
+      WebMock::Util::URI.strip_default_port_from_uri_string(uri).should == uri
+    end
+
+    it "should strip_default_port_from_uri does not modify strings that do not start with http or https" do
+      uri = "httpz://example.com:80/"
+      WebMock::Util::URI.strip_default_port_from_uri_string(uri).should == uri
+    end
+
+  end
+
+
+  describe "encoding userinfo" do
+
+    it "should encode unsafe chars in userinfo does not encode userinfo safe punctuation" do
+      userinfo = "user;&=+$,:secret"
+      WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo).should == userinfo
+    end
+
+    it "should encode unsafe chars in userinfo does not encode rfc 3986 unreserved characters" do
+      userinfo = "-.!~*'()abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:secret"
+      WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo).should == userinfo
+    end
+
+    it "should encode unsafe chars in userinfo does encode other characters" do
+      userinfo, safe_userinfo = 'us#rn@me:sec//ret?"', 'us%23rn%40me:sec%2F%2Fret%3F%22'
+      WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo).should == safe_userinfo
+    end
+
+  end
+
+end

data/spec/vendor/addressable/lib/addressable/uri.rb

@@ -0,0 +1,8 @@
+module Addressable
+  class URI
+    module CharacterClasses
+      UNRESERVED = "123"
+      SUB_DELIMS = "123"
+    end
+  end
+end

data/spec/webmock_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-include WebMock
-
 SAMPLE_HEADERS = { "Content-Length" => "8888" }
+ESCAPED_PARAMS = "x=ab%2Bc&z=%27Stop%21%27%20said%20Fred"
+NOT_ESCAPED_PARAMS = "z='Stop!' said Fred&x=ab c"
 
 describe "WebMock", :shared => true do
   before(:each) do
@@ -51,6 +51,25 @@ describe "WebMock", :shared => true do
 
   describe "when matching requests" do
 
+    describe "on uri" do
+
+      it "should match the request by uri with non escaped params if request have escaped parameters" do
+        stub_http_request(:get, "www.google.com/?#{NOT_ESCAPED_PARAMS}").to_return(:body => "abc")
+        http_request(:get, "http://www.google.com/?#{ESCAPED_PARAMS}").body.should == "abc"
+      end
+
+      it "should match the request by uri with escaped parameters even if request has non escaped params" do
+        stub_http_request(:get, "www.google.com/?#{ESCAPED_PARAMS}").to_return(:body => "abc")
+        http_request(:get, "http://www.google.com/?#{NOT_ESCAPED_PARAMS}").body.should == "abc"
+      end
+
+      it "should match the request by regexp matching non escaped params uri if request params are escaped" do
+        stub_http_request(:get, /.*x=ab c.*/).to_return(:body => "abc")
+        http_request(:get, "http://www.google.com/?#{ESCAPED_PARAMS}").body.should == "abc"
+      end
+
+    end
+
     describe "on method" do
 
       it "should match the request by method if registered" do
@@ -203,7 +222,7 @@ describe "WebMock", :shared => true do
         http_request(:get, "http://www.google.com/").body.should == "def"
       end
 
-      it "should not be affected by the type of url or request method" do
+      it "should not be affected by the type of uri or request method" do
         stub_http_request(:get, "www.google.com").to_return(:body => "abc")
         stub_http_request(:any, /.*google.*/).to_return(:body => "def")
         http_request(:get, "http://www.google.com/").body.should == "def"
@@ -221,7 +240,7 @@ describe "WebMock", :shared => true do
           stub_http_request(:any, "https://www.google.com")
         end
 
-        it "should pass if request was executed with the same url and method" do
+        it "should pass if request was executed with the same uri and method" do
           lambda {
             http_request(:get, "http://www.google.com/")
             request(:get, "http://www.google.com").should have_been_made.once
@@ -248,7 +267,7 @@ describe "WebMock", :shared => true do
           }.should fail_with("The request GET http://www.google.com/ was expected to execute 1 time but it executed 0 times")
         end
 
-        it "should fail if request was executed to different url" do
+        it "should fail if request was executed to different uri" do
           lambda {
             http_request(:get, "http://www.google.com/")
             request(:get, "http://www.google.org").should have_been_made
@@ -262,21 +281,21 @@ describe "WebMock", :shared => true do
           }.should fail_with("The request GET http://www.google.com/ was expected to execute 1 time but it executed 0 times")
         end
 
-        it "should_pass if request was executed with different form of url" do
+        it "should pass if request was executed with different form of uri" do
           lambda {
             http_request(:get, "http://www.google.com/")
             request(:get, "www.google.com").should have_been_made
           }.should_not raise_error
         end
 
-        it "should_pass if request was executed with different form of url without port " do
+        it "should pass if request was executed with different form of uri without port " do
           lambda {
             http_request(:get, "http://www.google.com/")
             request(:get, "www.google.com:80").should have_been_made
           }.should_not raise_error
         end
 
-        it "should_pass if request was executed with different form of url with port" do
+        it "should pass if request was executed with different form of uri with port" do
           lambda {
             http_request(:get, "http://www.google.com/")
             request(:get, "www.google.com:80").should have_been_made
@@ -290,13 +309,42 @@ describe "WebMock", :shared => true do
           }.should fail_with("The request GET http://www.google.com:90/ was expected to execute 1 time but it executed 0 times")
         end
 
-        it "should_pass if request was executed with different form of url with https port" do
+        it "should pass if request was executed with different form of uri with https port" do
           lambda {
             http_request(:get, "https://www.google.com/")
             request(:get, "https://www.google.com:443/").should have_been_made
           }.should_not raise_error
         end
 
+        describe "when matching requests with escaped uris" do
+
+          before(:each) do
+            WebMock.disable_net_connect!
+            stub_http_request(:any, "http://www.google.com/?#{NOT_ESCAPED_PARAMS}")
+          end
+
+          it "should pass if request was executed with escaped params" do
+            lambda {
+              http_request(:get, "http://www.google.com/?#{ESCAPED_PARAMS}")
+              request(:get, "http://www.google.com/?#{NOT_ESCAPED_PARAMS}").should have_been_made
+            }.should_not raise_error
+          end
+
+          it "should pass if request was executed with non escaped params but escaped expected" do
+            lambda {
+              http_request(:get, "http://www.google.com/?#{NOT_ESCAPED_PARAMS}")
+              request(:get, "http://www.google.com/?#{ESCAPED_PARAMS}").should have_been_made
+            }.should_not raise_error
+          end
+
+          it "should pass if request was executed with escaped params but uri matichg regexp expected" do
+            lambda {
+              http_request(:get, "http://www.google.com/?#{ESCAPED_PARAMS}")
+              request(:get, /.*google.*/).should have_been_made
+            }.should_not raise_error
+          end
+        end
+
         it "should fail if requested more times than expected" do
           lambda {
             http_request(:get, "http://www.google.com/")
@@ -438,7 +486,7 @@ describe "WebMock", :shared => true do
             }.should fail_with("The request GET http://www.google.com/ was expected to execute 0 times but it executed 1 time")
           end
         end
-        
+
 
 
         describe "using assert_requested" do

data/test/test_helper.rb

@@ -1,7 +1,11 @@
+require 'rubygems'
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'webmock/test_unit'
 require 'test/unit'
-require 'webmock'
+include WebMock
 
 def assert_fail(message, &block)
   e = assert_raise(Test::Unit::AssertionFailedError, &block)