webmock 0.7.1 → 0.7.2

data/lib/webmock/webmock.rb

@@ -1,50 +1,47 @@
-WebMock::Utility.record_loaded_net_http_replacement_libs
-WebMock::Utility.puts_warning_for_net_http_around_advice_libs_if_needed
-
-
 module WebMock
+  extend self
 
-  def stub_request(method, url)
-    RequestRegistry.instance.register_request_stub(RequestStub.new(method, url))
+  def stub_request(method, uri)
+    RequestRegistry.instance.register_request_stub(RequestStub.new(method, uri))
   end
   
   alias_method :stub_http_request, :stub_request
 
-  def request(method, url)
-    RequestProfile.new(method, url)
+  def request(method, uri)
+    RequestProfile.new(method, uri)
   end
 
-  def assert_requested(method, url, options = {})
+  def assert_requested(method, uri, options = {})
     expected_times_executed = options.delete(:times) || 1
-    request = RequestProfile.new(method, url, options[:body], options[:headers])
+    request = RequestProfile.new(method, uri, options[:body], options[:headers])
     verifier = RequestExecutionVerifier.new(request, expected_times_executed)
     assertion_failure(verifier.failure_message) unless verifier.matches?
   end
 
-  def assert_not_requested(method, url, options = {})
-    request = RequestProfile.new(method, url, options[:body], options[:headers])
+  def assert_not_requested(method, uri, options = {})
+    request = RequestProfile.new(method, uri, options[:body], options[:headers])
     verifier = RequestExecutionVerifier.new(request, options.delete(:times))
     assertion_failure(verifier.negative_failure_message) unless verifier.does_not_match?
   end
 
-  def self.allow_net_connect!
+  def allow_net_connect!
     Config.instance.allow_net_connect = true
   end
 
-  def self.disable_net_connect!
+  def disable_net_connect!
     Config.instance.allow_net_connect = false
   end
 
-  def self.net_connect_allowed?
+  def net_connect_allowed?
     Config.instance.allow_net_connect
   end
 
-  def self.registered_request?(request_profile)
-    RequestRegistry.instance.registered_request?(request_profile)
+  def registered_request?(request_signature)
+    RequestRegistry.instance.registered_request?(request_signature)
   end
 
-  def self.response_for_request(request_profile, &block)
-    RequestRegistry.instance.response_for_request(request_profile, &block)
+  def response_for_request(request_signature, &block)
+    RequestRegistry.instance.response_for_request(request_signature, &block)
   end
 
   def reset_webmock

data/spec/net_http_spec.rb

@@ -2,16 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'webmock_spec'
 require 'ostruct'
 
-include WebMock
-
-def http_request(method, url, options = {})
-  url = URI.parse(url)
+def http_request(method, uri, options = {})
+  begin
+    uri = URI.parse(uri)
+  rescue
+    uri = Addressable::URI.heuristic_parse(uri)
+  end
   response = nil
   clazz = Net::HTTP.const_get("#{method.to_s.capitalize}")
-  req = clazz.new(url.path, options[:headers])
-  req.basic_auth url.user, url.password if url.user
-  http = Net::HTTP.new(url.host, url.port)
-  http.use_ssl = true if url.scheme == "https"
+  req = clazz.new("#{uri.path}#{uri.query ? '?' : ''}#{uri.query}", options[:headers])
+  req.basic_auth uri.user, uri.password if uri.user
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl = true if uri.scheme == "https"
   response = http.start {|http|
     http.request(req, options[:body])
   }
@@ -21,7 +23,6 @@ def http_request(method, url, options = {})
     :status => response.code })
 end
 
-
 describe "Webmock with Net:HTTP" do
   
   it_should_behave_like "WebMock"

data/spec/other_net_http_libs_spec.rb

@@ -3,7 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "loading other Net::HTTP based libraries" do
 
   def capture_output_from_requiring(libs, additional_code = "")
-    requires = libs.map { |lib| "require '#{lib}'" }.join("; ")
+    requires = libs.map { |lib| "require '#{lib}'" }
+    requires << " require 'addressable/uri'"
+    requires = requires.join("; ")
     webmock_dir = "#{File.dirname(__FILE__)}/../lib"
     vendor_dirs = Dir["#{File.dirname(__FILE__)}/vendor/*/lib"]
     load_path_opts = vendor_dirs.unshift(webmock_dir).map { |dir| "-I#{dir}" }.join(" ")

data/spec/request_profile_spec.rb

@@ -1,26 +1,24 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-include WebMock
-
 describe RequestProfile do
 
   describe "initialization" do
 
     it "should have assigned normalized uri" do
-      URL.should_receive(:normalize_uri).and_return("www.google.kom")
+      WebMock::Util::URI.should_receive(:normalize_uri).and_return("www.google.kom")
       profile = RequestProfile.new(:get, "www.google.com")
       profile.uri.should == "www.google.kom"
     end
 
     it "should have assigned uri without normalization if uri is URI" do
-      URL.should_not_receive(:normalize_uri)
-      uri = URI.parse("www.google.com")
+      WebMock::Util::URI.should_not_receive(:normalize_uri)
+      uri = Addressable::URI.parse("www.google.com")
       profile = RequestProfile.new(:get, uri)
       profile.uri.should == uri
     end
 
     it "should have assigned normalized headers" do
-      Utility.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
+      WebMock::Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
       RequestProfile.new(:get, "www.google.com", nil, 'A' => 'a').headers.should == {'B' => 'b'}
     end
 
@@ -30,7 +28,7 @@ describe RequestProfile do
 
   end
 
-  it "should report string" do
+  it "should report string describing itself" do
     RequestProfile.new(:get, "www.google.com", "abc", {'A' => 'a', 'B' => 'b'}).to_s.should ==
     "GET http://www.google.com/ with body 'abc' with headers {'A'=>'a', 'B'=>'b'}"
   end
@@ -47,120 +45,12 @@ describe RequestProfile do
     end
 
     it "should assign normalized headers to request profile" do
-      Utility.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
+      WebMock::Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
       @request_profile.with(:headers => {'A' => 'a'})
       @request_profile.headers.should == {'B' => 'b'}
     end
 
   end
 
-  describe "when matching" do
-
-    it "should match if url matches and method matches" do
-      RequestProfile.new(:get, "www.google.com").
-        should match(RequestProfile.new(:get, "www.google.com"))
-    end
-
-    it "should match if url matches and method is any" do
-      RequestProfile.new(:get, "www.google.com").
-        should match(RequestProfile.new(:any, "www.google.com"))
-    end
-
-    it "should not match if other request profile has different method" do
-      RequestProfile.new(:get, "www.google.com").
-        should_not match(RequestProfile.new(:post, "www.google.com"))
-    end
-
-    it "should match if uri matches other uri" do
-      RequestProfile.new(:get, "www.google.com").
-        should match(RequestProfile.new(:get, "www.google.com"))
-    end
-
-    it "should match if uri matches other regex uri" do
-      RequestProfile.new(:get, "www.google.com").
-        should match(RequestProfile.new(:get, /.*google.*/))
-    end
-
-    it "should match for uris with same parameters" do
-      RequestProfile.new(:get, "www.google.com?a=1&b=2").
-        should match(RequestProfile.new(:get, "www.google.com?a=1&b=2"))
-    end
-
-    it "should not match for uris with different parameters" do
-      RequestProfile.new(:get, "www.google.com?a=2&b=1").
-        should_not match(RequestProfile.new(:get, "www.google.com?a=1&b=2"))
-    end
-
-    it "should match for parameters in different order" do
-      RequestProfile.new(:get, "www.google.com?a=1&b=2").
-        should match(RequestProfile.new(:get, "www.google.com?b=2&a=1"))
-    end
-
-    it "should match for same bodies" do
-      RequestProfile.new(:get, "www.google.com", "abc").
-        should match(RequestProfile.new(:get, "www.google.com", "abc"))
-    end
-
-    it "should not match for different bodies" do
-      RequestProfile.new(:get, "www.google.com", "abc").
-        should_not match(RequestProfile.new(:get, "www.google.com", "def"))
-    end
-
-    it "should match is other has nil body" do
-      RequestProfile.new(:get, "www.google.com", "abc").
-        should match(RequestProfile.new(:get, "www.google.com", nil))
-    end
-
-    it "should not match if other has empty body" do
-      RequestProfile.new(:get, "www.google.com", "abc").
-        should_not match(RequestProfile.new(:get, "www.google.com", ""))
-    end
-
-    it "should match for same headers" do
-      RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg').
-        should match(RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg'))
-    end
-
-    it "should not match for different values of the same header" do
-      RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg').
-        should_not match(RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/png'))
-    end
-
-    it "should match if request has more headers than other" do
-      RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg', 'Content-Length' => '8888').
-        should match(RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg'))
-    end
-
-    it "should not match if request has less headers that the other and all match" do
-      RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg').
-        should_not match(RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg', 'Content-Length' => '8888'))
-    end
-
-    it "should match even is header keys or values are in different format" do
-      RequestProfile.new(:get, "www.google.com", nil, :ContentLength => 8888, 'content_type' => 'image/png').
-        should match(RequestProfile.new(:get, "www.google.com", nil, 'ContentLength' => '8888', 'Content-type' => 'image/png'))
-    end
-
-    it "should match is other has nil headers" do
-      RequestProfile.new(:get, "www.google.com", nil, 'A' => 'a').
-        should match(RequestProfile.new(:get, "www.google.com", nil, nil))
-    end
-
-    it "should not match if other has empty headers" do
-      RequestProfile.new(:get, "www.google.com", nil, 'A' => 'a').
-        should_not match(RequestProfile.new(:get, "www.google.com", nil, {}))
-    end
-
-    it "should not match if profile has no headers but other has headers" do
-      RequestProfile.new(:get, "www.google.com", nil, nil).
-        should_not match(RequestProfile.new(:get, "www.google.com", nil, {'A'=>'a'}))
-    end
-
-    it "should not match if profile has empty headers but other has headers" do
-      RequestProfile.new(:get, "www.google.com", nil, {}).
-        should_not match(RequestProfile.new(:get, "www.google.com", nil, {'A'=>'a'}))
-    end
-
-  end
 
 end

data/spec/request_registry_spec.rb

@@ -5,19 +5,20 @@ describe RequestRegistry do
   before(:each) do
     RequestRegistry.instance.reset_webmock
     @request_profile = RequestProfile.new(:get, "www.google.com")
+    @request_signature = RequestSignature.new(:get, "www.google.com")
     @request_stub = RequestStub.new(:get, "www.google.com")
   end
 
   describe "reset_webmock" do
     before(:each) do
       RequestRegistry.instance.register_request_stub(@request_stub)
-      RequestRegistry.instance.response_for_request(@request_profile)
+      RequestRegistry.instance.requested_signatures.put(@request_signature)
     end
 
     it "should clean request stubs" do
-      RequestRegistry.instance.registered_request?(@request_profile).should == @request_stub
+      RequestRegistry.instance.registered_request?(@request_signature).should == @request_stub
       RequestRegistry.instance.reset_webmock
-      RequestRegistry.instance.registered_request?(@request_profile).should == nil
+      RequestRegistry.instance.registered_request?(@request_signature).should == nil
     end
 
     it "should clean list of executed requests" do
@@ -35,12 +36,12 @@ describe RequestRegistry do
     end
 
     it "should report if request stub is not registered" do
-      RequestRegistry.instance.registered_request?(@request_profile).should == nil
+      RequestRegistry.instance.registered_request?(@request_signature).should == nil
     end
 
     it "should register and report registered stib" do
       RequestRegistry.instance.register_request_stub(@request_stub)
-      RequestRegistry.instance.registered_request?(@request_profile).should == @request_stub
+      RequestRegistry.instance.registered_request?(@request_signature).should == @request_stub
     end
 
 
@@ -51,17 +52,11 @@ describe RequestRegistry do
     it "should registered response for request profile" do
       @request_stub.response = @response = Response.new
       RequestRegistry.instance.register_request_stub(@request_stub)
-      RequestRegistry.instance.response_for_request(@request_profile).should == @response
+      RequestRegistry.instance.response_for_request(@request_signature).should == @response
     end
 
     it "should report nothing if no response for request is registered" do
-      RequestRegistry.instance.response_for_request(@request_profile).should == nil
-    end
-
-    it "should increase number of times request was executed" do
-      RequestRegistry.instance.times_executed(@request_profile).should == 0
-      RequestRegistry.instance.response_for_request(@request_profile)
-      RequestRegistry.instance.times_executed(@request_profile).should == 1
+      RequestRegistry.instance.response_for_request(@request_signature).should == nil
     end
 
     it "should always return last registered matching response" do
@@ -74,7 +69,7 @@ describe RequestRegistry do
       RequestRegistry.instance.register_request_stub(@request_stub1)
       RequestRegistry.instance.register_request_stub(@request_stub2)
       RequestRegistry.instance.register_request_stub(@request_stub3)
-      RequestRegistry.instance.response_for_request(@request_profile).should == @response2
+      RequestRegistry.instance.response_for_request(@request_signature).should == @response2
     end
 
   end
@@ -91,9 +86,9 @@ describe RequestRegistry do
       @request_stub1 = RequestStub.new(:get, "www.google.com")
       @request_stub2 = RequestStub.new(:get, "www.google.net")
       @request_stub3 = RequestStub.new(:get, "www.google.org")
-      RequestRegistry.instance.response_for_request(RequestProfile.new(:get, "www.google.com"))
-      RequestRegistry.instance.response_for_request(RequestProfile.new(:get, "www.google.com"))
-      RequestRegistry.instance.response_for_request(RequestProfile.new(:get, "www.google.org"))
+      RequestRegistry.instance.requested_signatures.put(RequestSignature.new(:get, "www.google.com"))
+      RequestRegistry.instance.requested_signatures.put(RequestSignature.new(:get, "www.google.com"))
+      RequestRegistry.instance.requested_signatures.put(RequestSignature.new(:get, "www.google.org"))
     end
 
     it "should report 0 if no request matching profile was requested" do

data/spec/request_signature_spec.rb

@@ -0,0 +1,155 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe RequestSignature do
+
+  describe "when matching" do
+
+    it "should match if uri matches and method matches" do
+      RequestSignature.new(:get, "www.google.com").
+        should match(RequestProfile.new(:get, "www.google.com"))
+    end
+
+    it "should match if uri matches and method is any" do
+      RequestSignature.new(:get, "www.google.com").
+        should match(RequestProfile.new(:any, "www.google.com"))
+    end
+
+    it "should not match if other request profile has different method" do
+      RequestSignature.new(:get, "www.google.com").
+        should_not match(RequestProfile.new(:post, "www.google.com"))
+    end
+
+    it "should match if uri matches other uri" do
+      RequestSignature.new(:get, "www.google.com").
+        should match(RequestProfile.new(:get, "www.google.com"))
+    end
+    
+    it "should match if uri matches other escaped using uri" do
+      RequestSignature.new(:get, "www.google.com/big image.jpg").
+        should match(RequestProfile.new(:get, "www.google.com/big%20image.jpg"))
+    end
+    
+    it "should match if unescaped uri matches other uri" do
+      RequestSignature.new(:get, "www.google.com/big%20image.jpg").
+        should match(RequestProfile.new(:get, "www.google.com/big image.jpg"))
+    end
+    
+    it "should match if unescaped uri matches other regexp uri" do
+      RequestSignature.new(:get, "www.google.com/big%20image.jpg").
+        should match(RequestProfile.new(:get, /.*big image.jpg.*/))
+    end
+
+    it "should match if uri matches other regex uri" do
+      RequestSignature.new(:get, "www.google.com").
+        should match(RequestProfile.new(:get, /.*google.*/))
+    end
+
+    it "should match for uris with same parameters" do
+      RequestSignature.new(:get, "www.google.com?a=1&b=2").
+        should match(RequestProfile.new(:get, "www.google.com?a=1&b=2"))
+    end
+
+    it "should not match for uris with different parameters" do
+      RequestSignature.new(:get, "www.google.com?a=2&b=1").
+        should_not match(RequestProfile.new(:get, "www.google.com?a=1&b=2"))
+    end
+
+    it "should match for parameters in different order" do
+      RequestSignature.new(:get, "www.google.com?a=1&b=2").
+        should match(RequestProfile.new(:get, "www.google.com?b=2&a=1"))
+    end
+    
+    describe "when parameters are escaped" do
+    
+      it "should match if uri with non escaped parameters is the same as other uri with escaped parameters" do
+        RequestSignature.new(:get, "www.google.com/?a=a b").
+          should match(RequestProfile.new(:get, "www.google.com/?a=a%20b"))
+      end
+    
+      it "should match if uri with escaped parameters is the same as other uri with non escaped parameters" do
+        RequestSignature.new(:get, "www.google.com/?a=a%20b").
+          should match(RequestProfile.new(:get, "www.google.com/?a=a b"))
+      end
+    
+      it "should match if other regexp is for non escaped parameters but uri has escaped parameters" do
+        RequestSignature.new(:get, "www.google.com/?a=a%20b").
+          should match(RequestProfile.new(:get, /.*a=a b.*/))
+      end
+    
+      it "should match if other regexp is for escaped parameters but uri has non escaped parameters"  do
+        RequestSignature.new(:get, "www.google.com/?a=a b").
+          should match(RequestProfile.new(:get, /.*a=a%20b.*/))
+      end
+    
+    end
+    
+    
+
+    it "should match for same bodies" do
+      RequestSignature.new(:get, "www.google.com", "abc").
+        should match(RequestProfile.new(:get, "www.google.com", "abc"))
+    end
+
+    it "should not match for different bodies" do
+      RequestSignature.new(:get, "www.google.com", "abc").
+        should_not match(RequestProfile.new(:get, "www.google.com", "def"))
+    end
+
+    it "should match is other has nil body" do
+      RequestSignature.new(:get, "www.google.com", "abc").
+        should match(RequestProfile.new(:get, "www.google.com", nil))
+    end
+
+    it "should not match if other has empty body" do
+      RequestSignature.new(:get, "www.google.com", "abc").
+        should_not match(RequestProfile.new(:get, "www.google.com", ""))
+    end
+
+    it "should match for same headers" do
+      RequestSignature.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg').
+        should match(RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg'))
+    end
+
+    it "should not match for different values of the same header" do
+      RequestSignature.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg').
+        should_not match(RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/png'))
+    end
+
+    it "should match if request has more headers than other" do
+      RequestSignature.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg', 'Content-Length' => '8888').
+        should match(RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg'))
+    end
+
+    it "should not match if request has less headers that the other and all match" do
+      RequestSignature.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg').
+        should_not match(RequestProfile.new(:get, "www.google.com", nil, 'Content-Type' => 'image/jpeg', 'Content-Length' => '8888'))
+    end
+
+    it "should match even is header keys or values are in different format" do
+      RequestSignature.new(:get, "www.google.com", nil, :ContentLength => 8888, 'content_type' => 'image/png').
+        should match(RequestProfile.new(:get, "www.google.com", nil, 'ContentLength' => '8888', 'Content-type' => 'image/png'))
+    end
+
+    it "should match is other has nil headers" do
+      RequestSignature.new(:get, "www.google.com", nil, 'A' => 'a').
+        should match(RequestProfile.new(:get, "www.google.com", nil, nil))
+    end
+
+    it "should not match if other has empty headers" do
+      RequestSignature.new(:get, "www.google.com", nil, 'A' => 'a').
+        should_not match(RequestProfile.new(:get, "www.google.com", nil, {}))
+    end
+
+    it "should not match if profile has no headers but other has headers" do
+      RequestSignature.new(:get, "www.google.com", nil, nil).
+        should_not match(RequestProfile.new(:get, "www.google.com", nil, {'A'=>'a'}))
+    end
+
+    it "should not match if profile has empty headers but other has headers" do
+      RequestSignature.new(:get, "www.google.com", nil, {}).
+        should_not match(RequestProfile.new(:get, "www.google.com", nil, {'A'=>'a'}))
+    end
+
+  end
+
+end