webmock 1.5.0 → 1.6.0

data/spec/request_registry_spec.rb

@@ -3,102 +3,26 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe WebMock::RequestRegistry do
 
   before(:each) do
-    WebMock::RequestRegistry.instance.reset_webmock
+    WebMock::RequestRegistry.instance.reset!
     @request_pattern = WebMock::RequestPattern.new(:get, "www.example.com")
     @request_signature = WebMock::RequestSignature.new(:get, "www.example.com")
-    @request_stub = WebMock::RequestStub.new(:get, "www.example.com")
   end
 
-  describe "reset_webmock" do
+  describe "reset!" do
     before(:each) do
-      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
       WebMock::RequestRegistry.instance.requested_signatures.put(@request_signature)
     end
 
-    it "should clean request stubs" do
-      WebMock::RequestRegistry.instance.registered_request?(@request_signature).should == @request_stub
-      WebMock::RequestRegistry.instance.reset_webmock
-      WebMock::RequestRegistry.instance.registered_request?(@request_signature).should == nil
-    end
-
     it "should clean list of executed requests" do
       WebMock::RequestRegistry.instance.times_executed(@request_pattern).should == 1
-      WebMock::RequestRegistry.instance.reset_webmock
+      WebMock::RequestRegistry.instance.reset!
       WebMock::RequestRegistry.instance.times_executed(@request_pattern).should == 0
     end
 
   end
 
-  describe "registering and reporting registered requests" do
-
-    it "should return registered stub" do
-      WebMock::RequestRegistry.instance.register_request_stub(@request_stub).should == @request_stub
-    end
-
-    it "should report if request stub is not registered" do
-      WebMock::RequestRegistry.instance.registered_request?(@request_signature).should == nil
-    end
-
-    it "should register and report registered stib" do
-      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
-      WebMock::RequestRegistry.instance.registered_request?(@request_signature).should == @request_stub
-    end
-
-
-  end
-
-  describe "response for request" do
-
-    it "should report registered evaluated response for request pattern" do
-      @request_stub.to_return(:body => "abc")
-      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
-      WebMock::RequestRegistry.instance.response_for_request(@request_signature).
-        should == WebMock::Response.new(:body => "abc")
-    end
-
-    it "should report evaluated response" do
-      @request_stub.to_return {|request| {:body => request.method.to_s} }
-      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
-      response1 = WebMock::RequestRegistry.instance.response_for_request(@request_signature)
-      response1.should == WebMock::Response.new(:body => "get")
-    end
-
-    it "should report clone of theresponse" do
-      @request_stub.to_return {|request| {:body => request.method.to_s} }
-      WebMock::RequestRegistry.instance.register_request_stub(@request_stub)
-      response1 = WebMock::RequestRegistry.instance.response_for_request(@request_signature)
-      response2 = WebMock::RequestRegistry.instance.response_for_request(@request_signature)
-      response1.should_not be(response2)
-    end
-
-    it "should report nothing if no response for request is registered" do
-      WebMock::RequestRegistry.instance.response_for_request(@request_signature).should == nil
-    end
-
-    it "should always return last registered matching response" do
-      @request_stub1 = WebMock::RequestStub.new(:get, "www.example.com")
-      @request_stub1.to_return(:body => "abc")
-      @request_stub2 = WebMock::RequestStub.new(:get, "www.example.com")
-      @request_stub2.to_return(:body => "def")
-      @request_stub3 = WebMock::RequestStub.new(:get, "www.example.org")
-      @request_stub3.to_return(:body => "ghj")
-      WebMock::RequestRegistry.instance.register_request_stub(@request_stub1)
-      WebMock::RequestRegistry.instance.register_request_stub(@request_stub2)
-      WebMock::RequestRegistry.instance.register_request_stub(@request_stub3)
-      WebMock::RequestRegistry.instance.response_for_request(@request_signature).
-        should == WebMock::Response.new(:body => "def")
-    end
-
-  end
-
   describe "times executed" do
 
-    def times_executed(request_pattern)
-      self.requested.hash.select { |executed_request_pattern, times_executed|
-        executed_request_pattern.match(request_pattern)
-      }.inject(0) {|sum, (_, times_executed)| sum =+ times_executed }
-    end
-
     before(:each) do
       @request_stub1 = WebMock::RequestStub.new(:get, "www.example.com")
       @request_stub2 = WebMock::RequestStub.new(:get, "www.example.net")
@@ -117,10 +41,35 @@ describe WebMock::RequestRegistry do
     end
 
     it "should report number of times all matching pattern were requested" do
-     WebMock::RequestRegistry.instance.times_executed(WebMock::RequestPattern.new(:get, /.*example.*/)).should == 3
+      WebMock::RequestRegistry.instance.times_executed(WebMock::RequestPattern.new(:get, /.*example.*/)).should == 3
     end
+  end
 
+  describe "request_signatures" do
+    it "should return hash of unique request signatures with accumulated number" do
+      WebMock::RequestRegistry.instance.requested_signatures.put(WebMock::RequestSignature.new(:get, "www.example.com"))
+      WebMock::RequestRegistry.instance.requested_signatures.put(WebMock::RequestSignature.new(:get, "www.example.com"))
+      WebMock::RequestRegistry.instance.requested_signatures.
+        get(WebMock::RequestSignature.new(:get, "www.example.com")).should == 2
+    end
+  end
+
+  describe "to_s" do
+    it "should output string with all executed requests and numbers of executions" do
+      [
+        WebMock::RequestSignature.new(:get, "www.example.com"),
+        WebMock::RequestSignature.new(:get, "www.example.com"),
+        WebMock::RequestSignature.new(:put, "www.example.org"),
+      ].each do |s|
+        WebMock::RequestRegistry.instance.requested_signatures.put(s)
+      end
+      WebMock::RequestRegistry.instance.to_s.should ==
+      "GET http://www.example.com/ was made 2 times\nPUT http://www.example.org/ was made 1 time\n"
+    end
 
+    it "should output info if no requests were executed" do
+      WebMock::RequestRegistry.instance.to_s.should == "No requests were made."
+    end
   end
 
 end

data/spec/request_signature_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe WebMock::RequestSignature do
-  
+
   describe "initialization" do
 
     it "should have assigned normalized uri" do
@@ -33,5 +33,79 @@ describe WebMock::RequestSignature do
       :body => "abc", :headers => {'A' => 'a', 'B' => 'b'}).to_s.should ==
     "GET http://www.example.com/ with body 'abc' with headers {'A'=>'a', 'B'=>'b'}"
   end
-  
-end
+
+  describe "hash" do
+    it "should report same hash for two signatures with the same values" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com",
+        :body => "abc", :headers => {'A' => 'a', 'B' => 'b'})
+      signature2 = WebMock::RequestSignature.new(:get, "www.example.com",
+        :body => "abc", :headers => {'A' => 'a', 'B' => 'b'})
+      signature1.hash.should == signature2.hash
+    end
+
+    it "should report different hash for two signatures with different method" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com")
+      signature2 = WebMock::RequestSignature.new(:put, "www.example.com")
+      signature1.hash.should_not == signature2.hash
+    end
+
+    it "should report different hash for two signatures with different uri" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com")
+      signature2 = WebMock::RequestSignature.new(:get, "www.example.org")
+      signature1.hash.should_not == signature2.hash
+    end
+
+    it "should report different hash for two signatures with different body" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com", :body => "abc")
+      signature2 = WebMock::RequestSignature.new(:get, "www.example.com", :body => "def")
+      signature1.hash.should_not == signature2.hash
+    end
+
+    it "should report different hash for two signatures with different headers" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com",
+        :headers => {'A' => 'a'})
+      signature2 = WebMock::RequestSignature.new(:get, "www.example.com",
+        :headers => {'A' => 'A'})
+      signature1.hash.should_not == signature2.hash
+    end
+  end
+
+
+  describe "eql?" do
+    it "should be true for two signatures with the same values" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com",
+        :body => "abc", :headers => {'A' => 'a', 'B' => 'b'})
+      signature2 = WebMock::RequestSignature.new(:get, "www.example.com",
+        :body => "abc", :headers => {'A' => 'a', 'B' => 'b'})
+
+      signature1.should eql(signature2)
+    end
+
+    it "should be false for two signatures with different method" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com")
+      signature2 = WebMock::RequestSignature.new(:put, "www.example.com")
+      signature1.should_not eql(signature2)
+    end
+
+    it "should be false for two signatures with different uri" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com")
+      signature2 = WebMock::RequestSignature.new(:get, "www.example.org")
+      signature1.should_not eql(signature2)
+    end
+
+    it "should be false for two signatures with different body" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com", :body => "abc")
+      signature2 = WebMock::RequestSignature.new(:get, "www.example.com", :body => "def")
+      signature1.should_not eql(signature2)
+    end
+
+    it "should be false for two signatures with different headers" do
+      signature1 = WebMock::RequestSignature.new(:get, "www.example.com",
+        :headers => {'A' => 'a'})
+      signature2 = WebMock::RequestSignature.new(:get, "www.example.com",
+        :headers => {'A' => 'A'})
+      signature1.should_not eql(signature2)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -14,8 +14,6 @@ require 'webmock/rspec'
 
 require 'network_connection'
 
-require 'json'
-
 RSpec.configure do |config|
   config.include WebMock::API  
   unless NetworkConnection.is_network_available?
@@ -49,19 +47,3 @@ def setup_expectations_for_real_example_com_request(options = {})
   setup_expectations_for_real_request(defaults.merge(options))
 end
 
-def client_specific_request_string(string)
-  method = string.gsub(/.*Unregistered request: ([^ ]+).+/, '\1')
-  has_body = string.include?(" with body")
-  default_headers = default_client_request_headers(method, has_body)
-  if default_headers
-    if string.include?(" with headers")
-      current_headers = JSON.parse(string.gsub(/.*with headers (\{[^}]+\}).*/, '\1').gsub("=>",":").gsub("'","\""))
-      default_headers = WebMock::Util::Headers.normalize_headers(default_headers)
-      default_headers.merge!(current_headers)
-      string.gsub!(/(.*) with headers.*/,'\1')
-    end
-    string << " with headers #{WebMock::Util::Headers.sorted_headers_string(default_headers)}"
-  end
-  string
-end
-

data/spec/stub_registry_spec.rb

@@ -0,0 +1,86 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe WebMock::StubRegistry do
+
+  before(:each) do
+    WebMock::StubRegistry.instance.reset!
+    @request_pattern = WebMock::RequestPattern.new(:get, "www.example.com")
+    @request_signature = WebMock::RequestSignature.new(:get, "www.example.com")
+    @request_stub = WebMock::RequestStub.new(:get, "www.example.com")
+  end
+
+  describe "reset!" do
+    before(:each) do
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub)
+    end
+
+    it "should clean request stubs" do
+      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == @request_stub
+      WebMock::StubRegistry.instance.reset!
+      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == nil
+    end
+  end
+
+  describe "registering and reporting registered requests" do
+
+    it "should return registered stub" do
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub).should == @request_stub
+    end
+
+    it "should report if request stub is not registered" do
+      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == nil
+    end
+
+    it "should register and report registered stib" do
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub)
+      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == @request_stub
+    end
+
+
+  end
+
+  describe "response for request" do
+
+    it "should report registered evaluated response for request pattern" do
+      @request_stub.to_return(:body => "abc")
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub)
+      WebMock::StubRegistry.instance.response_for_request(@request_signature).
+        should == WebMock::Response.new(:body => "abc")
+    end
+
+    it "should report evaluated response" do
+      @request_stub.to_return {|request| {:body => request.method.to_s} }
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub)
+      response1 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
+      response1.should == WebMock::Response.new(:body => "get")
+    end
+
+    it "should report clone of theresponse" do
+      @request_stub.to_return {|request| {:body => request.method.to_s} }
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub)
+      response1 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
+      response2 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
+      response1.should_not be(response2)
+    end
+
+    it "should report nothing if no response for request is registered" do
+      WebMock::StubRegistry.instance.response_for_request(@request_signature).should == nil
+    end
+
+    it "should always return last registered matching response" do
+      @request_stub1 = WebMock::RequestStub.new(:get, "www.example.com")
+      @request_stub1.to_return(:body => "abc")
+      @request_stub2 = WebMock::RequestStub.new(:get, "www.example.com")
+      @request_stub2.to_return(:body => "def")
+      @request_stub3 = WebMock::RequestStub.new(:get, "www.example.org")
+      @request_stub3.to_return(:body => "ghj")
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub1)
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub2)
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub3)
+      WebMock::StubRegistry.instance.response_for_request(@request_signature).
+        should == WebMock::Response.new(:body => "def")
+    end
+
+  end
+
+end

data/spec/stub_request_snippet_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe WebMock::StubRequestSnippet do
+  describe "to_s" do
+    before(:each) do
+      @request_signature = WebMock::RequestSignature.new(:get, "www.example.com/?a=b&c=d")
+    end
+
+    it "should print stub request snippet with url with params and method and empty successful response" do
+      expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").\n  to_return(:status => 200, :body => "", :headers => {}))
+      WebMock::StubRequestSnippet.new(@request_signature).to_s.should == expected
+    end
+
+    it "should print stub request snippet with body if available" do
+      @request_signature.body = "abcdef"
+      expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").)+  
+      "\n  with(:body => \"abcdef\")." +
+      "\n  to_return(:status => 200, :body => \"\", :headers => {})"
+      WebMock::StubRequestSnippet.new(@request_signature).to_s.should == expected
+    end
+    
+    it "should print stub request snippet with multiline body" do
+      @request_signature.body = "abc\ndef"
+      expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").)+  
+      "\n  with(:body => \"abc\\ndef\")." +
+      "\n  to_return(:status => 200, :body => \"\", :headers => {})"
+      WebMock::StubRequestSnippet.new(@request_signature).to_s.should == expected
+    end
+    
+    it "should print stub request snippet with headers if any" do
+      @request_signature.headers = {'B' => 'b', 'A' => 'a'}
+      expected = 'stub_request(:get, "http://www.example.com/?a=b&c=d").'+  
+      "\n  with(:headers => {\'A\'=>\'a\', \'B\'=>\'b\'})." +
+      "\n  to_return(:status => 200, :body => \"\", :headers => {})"
+      WebMock::StubRequestSnippet.new(@request_signature).to_s.should == expected
+    end
+    
+    it "should print stub request snippet with body and headers" do
+      @request_signature.body = "abcdef"
+      @request_signature.headers = {'B' => 'b', 'A' => 'a'}
+      expected = 'stub_request(:get, "http://www.example.com/?a=b&c=d").'+  
+      "\n  with(:body => \"abcdef\", \n       :headers => {\'A\'=>\'a\', \'B\'=>\'b\'})." +
+      "\n  to_return(:status => 200, :body => \"\", :headers => {})"
+      WebMock::StubRequestSnippet.new(@request_signature).to_s.should == expected
+    end
+  end
+end

data/spec/util/hash_counter_spec.rb

@@ -21,4 +21,19 @@ describe WebMock::Util::HashCounter do
     counter.get(:def).should == 0
   end
 
+  describe "each" do
+    it "should provide elements in order of the last modified" do
+      counter = WebMock::Util::HashCounter.new
+      counter.put(:a)
+      counter.put(:b)
+      counter.put(:c)
+      counter.put(:b)
+      counter.put(:a)
+      counter.put(:d)
+
+      elements = []
+      counter.each {|k,v| elements << [k,v]}
+      elements.should == [[:c, 1], [:b, 2], [:a, 2], [:d, 1]]
+    end
+  end
 end

data/spec/util/hash_keys_stringifier_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe WebMock::Util::HashKeysStringifier do
+
+  it "should recursively stringify all symbol keys" do
+    hash = {
+      :a => {
+        :b => [
+          {
+            :c => [{:d => "1"}]
+          }
+        ]
+      }
+    }
+    stringified = {
+      'a' => {
+        'b' => [
+          {
+            'c' => [{'d' => "1"}]
+          }
+        ]
+      }
+    }
+    WebMock::Util::HashKeysStringifier.stringify_keys!(hash).should == stringified
+  end
+
+end

data/spec/webmock_shared.rb

@@ -21,7 +21,7 @@ end
 shared_examples_for "WebMock" do
   before(:each) do
     WebMock.disable_net_connect!
-    WebMock::RequestRegistry.instance.reset_webmock
+    WebMock.reset!
   end
 
   describe "when web connect" do
@@ -63,11 +63,16 @@ shared_examples_for "WebMock" do
         stub_http_request(:get, "www.example.com").to_return(:body => "abc")
         http_request(:get, "http://www.example.com/").body.should == "abc"
       end
+      
+      it "should return stubbed response if request with path was stubbed" do
+        stub_http_request(:get, "www.example.com/hello_world").to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/hello_world").body.should == "abc"
+      end
 
       it "should raise exception if request was not stubbed" do
         lambda {
           http_request(:get, "http://www.example.com/")
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
       end
     end
 
@@ -84,7 +89,7 @@ shared_examples_for "WebMock" do
       it "should raise exception if request was not stubbed" do
         lambda {
           http_request(:get, "http://www.example.com/")
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
       end
 
       it "should allow a real request to localhost" do
@@ -119,7 +124,7 @@ shared_examples_for "WebMock" do
       it "should raise exception if request was not stubbed" do
         lambda {
           http_request(:get, "http://www.example.com/")
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
       end
 
       it "should allow a real request to allowed host", :net_connect => true do
@@ -133,18 +138,18 @@ shared_examples_for "WebMock" 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.example.com/?#{NOT_ESCAPED_PARAMS}").to_return(:body => "abc")
-        http_request(:get, "http://www.example.com/?#{ESCAPED_PARAMS}").body.should == "abc"
+        stub_http_request(:get, "www.example.com/hello/?#{NOT_ESCAPED_PARAMS}").to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/hello/?#{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.example.com/?#{ESCAPED_PARAMS}").to_return(:body => "abc")
-        http_request(:get, "http://www.example.com/?#{NOT_ESCAPED_PARAMS}").body.should == "abc"
+        stub_http_request(:get, "www.example.com/hello/?#{ESCAPED_PARAMS}").to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/hello/?#{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.example.com/?#{ESCAPED_PARAMS}").body.should == "abc"
+        http_request(:get, "http://www.example.com/hello/?#{ESCAPED_PARAMS}").body.should == "abc"
       end
         
     end
@@ -180,8 +185,7 @@ shared_examples_for "WebMock" do
         http_request(:get, "http://www.example.com/").status.should == "200"
         lambda {
           http_request(:delete, "http://www.example.com/")
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-        "Real HTTP connections are disabled. Unregistered request: DELETE http://www.example.com/")
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: DELETE http://www.example.com/)
         )
       end
 
@@ -207,8 +211,7 @@ shared_examples_for "WebMock" do
         stub_http_request(:post, "www.example.com").with(:body => "abc")
         lambda {
           http_request(:post, "http://www.example.com/", :body => "def")
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-        "Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'def'"))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'def'))
       end
 
       describe "with regular expressions" do
@@ -224,8 +227,7 @@ shared_examples_for "WebMock" do
           stub_http_request(:post, "www.example.com").with(:body => /^abc/)
           lambda {
             http_request(:post, "http://www.example.com/", :body => "xabc")
-          }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-          "Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'xabc'"))
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'xabc'))
         end
 
       end
@@ -255,9 +257,7 @@ shared_examples_for "WebMock" do
               http_request(
                 :post, "http://www.example.com/",
                 :body => 'c[d][]=f&a=1&c[d][]=e').status.should == "200"
-            }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-            "Real HTTP connections are disabled. Unregistered request: "+
-            "POST http://www.example.com/ with body 'c[d][]=f&a=1&c[d][]=e'"))
+            }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'c\[d\]\[\]=f&a=1&c\[d\]\[\]=e'))
           end
         
         end
@@ -281,7 +281,7 @@ shared_examples_for "WebMock" do
         
         describe "for request with xml body and content type is set to xml" do
           before(:each) do
-            WebMock.reset_webmock
+            WebMock.reset!
             stub_http_request(:post, "www.example.com").
               with(:body => { "opt" => {:a => '1', :b => 'five', 'c' => {'d' => ['e', 'f']} }})
           end
@@ -343,8 +343,7 @@ shared_examples_for "WebMock" do
             http_request(
               :get, "http://www.example.com/",
             :headers => {"a" => ["b", "d"]})
-          }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-            %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'A'=>['b', 'd']})))
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers))
         end
       
       end
@@ -363,8 +362,7 @@ shared_examples_for "WebMock" do
           http_request(
             :get, "http://www.example.com/",
           :headers => { 'Content-Length' => '9999'})
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-          %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'Content-Length'=>'9999'})))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers))
       end
 
       it "should not match if accept header is different" do
@@ -374,8 +372,7 @@ shared_examples_for "WebMock" do
           http_request(
             :get, "http://www.example.com/",
           :headers => { 'Accept' => 'application/xml'})
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-        %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'Accept'=>'application/xml'})))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers))
       end
 
       describe "with regular expressions" do
@@ -394,8 +391,7 @@ shared_examples_for "WebMock" do
             http_request(
               :get, "http://www.example.com/",
             :headers => { 'user-agent' => 'xMyAppName' })
-          }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-          %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'User-Agent'=>'xMyAppName'})))
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers))
         end
 
       end
@@ -412,24 +408,21 @@ shared_examples_for "WebMock" do
         stub_http_request(:get, "user:pass@www.example.com")
         lambda {
           http_request(:get, "http://user:pazz@www.example.com/").status.should == "200"
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-        %q(Real HTTP connections are disabled. Unregistered request: GET http://user:pazz@www.example.com/)))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://user:pazz@www.example.com/))
       end
 
       it "should not match if credentials are stubbed but not provided in the request" do
         stub_http_request(:get, "user:pass@www.example.com")
         lambda {
           http_request(:get, "http://www.example.com/").status.should == "200"
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-        %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/)))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
       end
 
       it "should not match if credentials are not stubbed but exist in the request" do
         stub_http_request(:get, "www.example.com")
         lambda {
           http_request(:get, "http://user:pazz@www.example.com/").status.should == "200"
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-        %q(Real HTTP connections are disabled. Unregistered request: GET http://user:pazz@www.example.com/)))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://user:pazz@www.example.com/))
       end
 
     end
@@ -445,8 +438,7 @@ shared_examples_for "WebMock" do
         stub_http_request(:get, "www.example.com").with { |request| false }
         lambda {
           http_request(:get, "http://www.example.com/")
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-        "Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
       end
 
       it "should pass the request to the block" do
@@ -456,8 +448,7 @@ shared_examples_for "WebMock" do
           :body => "wadus").status.should == "200"
         lambda {
           http_request(:post, "http://www.example.com/", :body => "jander")
-        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
-        "Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'jander'"))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'jander'))
       end
 
     end
@@ -879,28 +870,34 @@ shared_examples_for "WebMock" do
                 lambda {
                   http_request(:get, "http://www.example.com/")
                   a_request(:get, "http://www.example.com").should_not have_been_made
-                }.should fail_with("The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time")
+                }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time))
+              end
+              
+              it "should fail with message with executed requests listed" do
+                lambda {
+                  http_request(:get, "http://www.example.com/")
+                  a_request(:get, "http://www.example.com").should_not have_been_made
+                }.should fail_with(%r{The following requests were made:\n\nGET http://www.example.com/.+was made 1 time})
               end
-
 
               it "should fail if request was not executed" do
                 lambda {
                   a_request(:get, "http://www.example.com").should have_been_made
-                }.should fail_with("The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times")
+                }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times))
               end
 
               it "should fail if request was executed to different uri" do
                 lambda {
                   http_request(:get, "http://www.example.com/")
                   a_request(:get, "http://www.example.org").should have_been_made
-                }.should fail_with("The request GET http://www.example.org/ was expected to execute 1 time but it executed 0 times")
+                }.should fail_with(%r(The request GET http://www.example.org/ was expected to execute 1 time but it executed 0 times))
               end
 
               it "should fail if request was executed with different method" do
                 lambda {
                   http_request(:post, "http://www.example.com/", :body => "abc")
                   a_request(:get, "http://www.example.com").should have_been_made
-                }.should fail_with("The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times")
+                }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times))
               end
 
               it "should pass if request was executed with different form of uri" do
@@ -928,7 +925,7 @@ shared_examples_for "WebMock" do
                 lambda {
                   http_request(:get, "http://www.example.com:80/")
                   a_request(:get, "www.example.com:90").should have_been_made
-                }.should fail_with("The request GET http://www.example.com:90/ was expected to execute 1 time but it executed 0 times")
+                }.should fail_with(%r(The request GET http://www.example.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 uri with https port" do
@@ -1001,21 +998,21 @@ shared_examples_for "WebMock" do
                   http_request(:get, "http://www.example.com/")
                   http_request(:get, "http://www.example.com/")
                   a_request(:get, "http://www.example.com").should have_been_made
-                }.should fail_with("The request GET http://www.example.com/ was expected to execute 1 time but it executed 2 times")
+                }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 1 time but it executed 2 times))
               end
 
               it "should fail if requested less times than expected" do
                 lambda {
                   http_request(:get, "http://www.example.com/")
                   a_request(:get, "http://www.example.com").should have_been_made.twice
-                }.should fail_with("The request GET http://www.example.com/ was expected to execute 2 times but it executed 1 time")
+                }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 2 times but it executed 1 time))
               end
 
               it "should fail if requested less times than expected when 3 times expected" do
                 lambda {
                   http_request(:get, "http://www.example.com/")
                   a_request(:get, "http://www.example.com").should have_been_made.times(3)
-                }.should fail_with("The request GET http://www.example.com/ was expected to execute 3 times but it executed 1 time")
+                }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 3 times but it executed 1 time))
               end
 
               it "should succeed if request was executed with the same body" do
@@ -1030,7 +1027,7 @@ shared_examples_for "WebMock" do
                   http_request(:get, "http://www.example.com/", :body => "abc")
                   a_request(:get, "www.example.com").
                   with(:body => "def").should have_been_made
-                }.should fail_with('The request GET http://www.example.com/ with body "def" was expected to execute 1 time but it executed 0 times')
+                }.should fail_with(%r(The request GET http://www.example.com/ with body "def" was expected to execute 1 time but it executed 0 times))
               end
 
               describe "when expected body is declared as regexp" do
@@ -1047,14 +1044,14 @@ shared_examples_for "WebMock" do
                     http_request(:get, "http://www.example.com/", :body => /^abc/)
                     a_request(:get, "www.example.com").
                     with(:body => "xabc").should have_been_made
-                  }.should fail_with('The request GET http://www.example.com/ with body "xabc" was expected to execute 1 time but it executed 0 times')
+                  }.should fail_with(%r(The request GET http://www.example.com/ with body "xabc" was expected to execute 1 time but it executed 0 times))
                 end
               
               end
               
               describe "when expected body is declared as a hash" do
                 let(:body_hash) { {:a => '1', :b => 'five', 'c' => {'d' => ['e', 'f']}} }
-                let(:fail_message) {'The request POST http://www.example.com/ with body {"a"=>"1", "b"=>"five", "c"=>{"d"=>["e", "f"]}} was expected to execute 1 time but it executed 0 times'}
+                let(:fail_message) {%r(The request POST http://www.example.com/ with body \{"a"=>"1", "b"=>"five", "c"=>\{"d"=>\["e", "f"\]\}\} was expected to execute 1 time but it executed 0 times)}
 
                 describe "when request is executed with url encoded body matching hash" do
                 
@@ -1164,7 +1161,7 @@ shared_examples_for "WebMock" do
                     http_request(:get, "http://www.example.com/", :headers => {"a" => ["b", "c"]})
                     a_request(:get, "www.example.com").
                     with(:headers => {"a" => ["b", "d"]}).should have_been_made
-                  }.should fail_with("The request GET http://www.example.com/ with headers {'A'=>['b', 'd']} was expected to execute 1 time but it executed 0 times")
+                  }.should fail_with(%r(The request GET http://www.example.com/ with headers \{'A'=>\['b', 'd'\]\} was expected to execute 1 time but it executed 0 times))
                 end
                 
               end
@@ -1174,7 +1171,7 @@ shared_examples_for "WebMock" do
                   http_request(:get, "http://www.example.com/", :headers => SAMPLE_HEADERS)
                   a_request(:get, "www.example.com").
                   with(:headers => { 'Content-Length' => '9999'}).should have_been_made
-                }.should fail_with("The request GET http://www.example.com/ with headers {'Content-Length'=>'9999'} was expected to execute 1 time but it executed 0 times")
+                }.should fail_with(%r(The request GET http://www.example.com/ with headers \{'Content-Length'=>'9999'\} was expected to execute 1 time but it executed 0 times))
               end
 
               it "should fail if request was executed with less headers" do
@@ -1182,7 +1179,7 @@ shared_examples_for "WebMock" do
                   http_request(:get, "http://www.example.com/", :headers => {'A' => 'a'})
                   a_request(:get, "www.example.com").
                   with(:headers => {'A' => 'a', 'B' => 'b'}).should have_been_made
-                }.should fail_with("The request GET http://www.example.com/ with headers {'A'=>'a', 'B'=>'b'} was expected to execute 1 time but it executed 0 times")
+                }.should fail_with(%r(The request GET http://www.example.com/ with headers \{'A'=>'a', 'B'=>'b'\} was expected to execute 1 time but it executed 0 times))
               end
 
               it "should succeed if request was executed with more headers" do
@@ -1218,7 +1215,7 @@ shared_examples_for "WebMock" do
                   http_request(:get, "http://www.example.com/", :headers => { 'user_agent' => 'xMyAppName' })
                   a_request(:get, "www.example.com").
                   with(:headers => { :user_agent => /^MyAppName$/ }).should have_been_made
-                }.should fail_with("The request GET http://www.example.com/ with headers {'User-Agent'=>/^MyAppName$/} was expected to execute 1 time but it executed 0 times")
+                }.should fail_with(%r(The request GET http://www.example.com/ with headers \{'User-Agent'=>/\^MyAppName\$/\} was expected to execute 1 time but it executed 0 times))
               end
 
              it "should suceed if request was executed and block evaluated to true" do
@@ -1232,14 +1229,14 @@ shared_examples_for "WebMock" do
                 lambda {
                   http_request(:post, "http://www.example.com/", :body => "abc")
                   a_request(:post, "www.example.com").with { |req| req.body == "wadus" }.should have_been_made
-                }.should fail_with("The request POST http://www.example.com/ with given block was expected to execute 1 time but it executed 0 times")
+                }.should fail_with(%r(The request POST http://www.example.com/ with given block was expected to execute 1 time but it executed 0 times))
               end
 
               it "should fail if request was not expected but it executed and block matched request" do
                 lambda {
                   http_request(:post, "http://www.example.com/", :body => "wadus")
                   a_request(:post, "www.example.com").with { |req| req.body == "wadus" }.should_not have_been_made
-                }.should fail_with("The request POST http://www.example.com/ with given block was expected to execute 0 times but it executed 1 time")
+                }.should fail_with(%r(The request POST http://www.example.com/ with given block was expected to execute 0 times but it executed 1 time))
               end
 
               describe "with authentication" do
@@ -1259,21 +1256,21 @@ shared_examples_for "WebMock" do
                   lambda {
                     http_request(:get, "http://user:pass@www.example.com/")
                     a_request(:get, "http://user:pazz@www.example.com").should have_been_made.once
-                  }.should fail_with("The request GET http://user:pazz@www.example.com/ was expected to execute 1 time but it executed 0 times")
+                  }.should fail_with(%r(The request GET http://user:pazz@www.example.com/ was expected to execute 1 time but it executed 0 times))
                 end
 
                 it "should fail if request was executed without credentials but credentials were expected" do
                   lambda {
                     http_request(:get, "http://www.example.com/")
                     a_request(:get, "http://user:pass@www.example.com").should have_been_made.once
-                  }.should fail_with("The request GET http://user:pass@www.example.com/ was expected to execute 1 time but it executed 0 times")
+                  }.should fail_with(%r(The request GET http://user:pass@www.example.com/ was expected to execute 1 time but it executed 0 times))
                 end
 
                 it "should fail if request was executed with credentials but expected without" do
                   lambda {
                     http_request(:get, "http://user:pass@www.example.com/")
                     a_request(:get, "http://www.example.com").should have_been_made.once
-                  }.should fail_with("The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times")
+                  }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times))
                 end
 
                 it "should be order insensitive" do
@@ -1306,7 +1303,7 @@ shared_examples_for "WebMock" do
                   lambda {
                     http_request(:get, "http://www.example.com/")
                     WebMock.should_not have_requested(:get, "http://www.example.com")
-                  }.should fail_with("The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time")
+                  }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time))
                 end
 
                 it "should succeed if request was executed and block evaluated to true" do
@@ -1320,14 +1317,14 @@ shared_examples_for "WebMock" do
                   lambda {
                     http_request(:post, "http://www.example.com/", :body => "abc")
                     WebMock.should have_requested(:post, "www.example.com").with { |req| req.body == "wadus" }
-                  }.should fail_with("The request POST http://www.example.com/ with given block was expected to execute 1 time but it executed 0 times")
+                  }.should fail_with(%r(The request POST http://www.example.com/ with given block was expected to execute 1 time but it executed 0 times))
                 end
 
                 it "should fail if request was not expected but executed and block matched request" do
                   lambda {
                     http_request(:post, "http://www.example.com/", :body => "wadus")
                     WebMock.should_not have_requested(:post, "www.example.com").with { |req| req.body == "wadus" }
-                  }.should fail_with("The request POST http://www.example.com/ with given block was expected to execute 0 times but it executed 1 time")
+                  }.should fail_with(%r(The request POST http://www.example.com/ with given block was expected to execute 0 times but it executed 1 time))
                 end
               end
 
@@ -1354,14 +1351,14 @@ shared_examples_for "WebMock" do
                   lambda {
                     http_request(:get, "http://www.example.com/")
                     assert_not_requested(:get, "http://www.example.com")
-                  }.should fail_with("The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time")
+                  }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time))
                 end
 
                  it "should verify if non expected request executed and block evaluated to true" do
                    lambda {
                      http_request(:post, "http://www.example.com/", :body => "wadus")
                      assert_not_requested(:post, "www.example.com") { |req| req.body == "wadus" }
-                   }.should fail_with("The request POST http://www.example.com/ with given block was expected to execute 0 times but it executed 1 time")
+                   }.should fail_with(%r(The request POST http://www.example.com/ with given block was expected to execute 0 times but it executed 1 time))
                  end
 
                 it "should verify if request was executed and block evaluated to true" do
@@ -1375,7 +1372,7 @@ shared_examples_for "WebMock" do
                    lambda {
                      http_request(:post, "http://www.example.com/", :body => "abc")
                      assert_requested(:post, "www.example.com") { |req| req.body == "wadus" }
-                   }.should fail_with("The request POST http://www.example.com/ with given block was expected to execute 1 time but it executed 0 times")
+                   }.should fail_with(%r(The request POST http://www.example.com/ with given block was expected to execute 1 time but it executed 0 times))
                  end
               end
             end
@@ -1398,7 +1395,7 @@ shared_examples_for "WebMock" do
                 lambda {
                   http_request(:get, "http://www.example.com/")
                   a_request(:get, "http://www.example.com").should_not have_been_made
-                }.should fail_with("The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time")
+                }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time))
               end
             end
 
@@ -1487,7 +1484,7 @@ shared_examples_for "WebMock" do
         
         describe "for real requests", :net_connect => true do
           before(:each) do
-            WebMock.reset_webmock
+            WebMock.reset!
             WebMock.allow_net_connect!
             WebMock.after_request(:except => [:other_lib])  do |_, response|
               @response = response