webmock 1.8.6 → 3.14.0

data/spec/unit/response_spec.rb

@@ -5,16 +5,16 @@ describe WebMock::ResponseFactory do
   describe "response_for" do
 
     it "should create response with options passed as arguments" do
-      options = {:body => "abc", :headers => {:a => :b}}
-      WebMock::Response.should_receive(:new).with(options).and_return(@response = mock(WebMock::Response))
-      WebMock::ResponseFactory.response_for(options).should == @response
+      options = {body: "abc", headers: {a: :b}}
+      expect(WebMock::Response).to receive(:new).with(options).and_return(@response = double(WebMock::Response))
+      expect(WebMock::ResponseFactory.response_for(options)).to eq(@response)
     end
 
 
     it "should create dynamic response for argument responding to call" do
-      callable = mock(:call => {:body => "abc"})
-      WebMock::DynamicResponse.should_receive(:new).with(callable).and_return(@response = mock(WebMock::Response))
-      WebMock::ResponseFactory.response_for(callable).should == @response
+      callable = double(call: {body: "abc"})
+      expect(WebMock::DynamicResponse).to receive(:new).with(callable).and_return(@response = double(WebMock::Response))
+      expect(WebMock::ResponseFactory.response_for(callable)).to eq(@response)
     end
 
   end
@@ -23,54 +23,56 @@ end
 
 describe WebMock::Response do
   before(:each) do
-    @response = WebMock::Response.new(:headers => {'A' => 'a'})
+    @response = WebMock::Response.new(headers: {'A' => 'a'})
+  end
+
+  it "should raise an error when initialized with unknown option" do
+    expect { WebMock::Response.new(foo: "bar") }.to raise_error('Unknown key: "foo". Valid keys are: "headers", "status", "body", "exception", "should_timeout"')
   end
 
   it "should report normalized headers" do
-    WebMock::Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
-    @response = WebMock::Response.new(:headers => {'A' => 'a'})
-    @response.headers.should == {'B' => 'b'}
+    expect(WebMock::Util::Headers).to receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
+    @response = WebMock::Response.new(headers: {'A' => 'a'})
+    expect(@response.headers).to eq({'B' => 'b'})
   end
 
   describe "status" do
-
     it "should have 200 code and empty message by default" do
-      @response.status.should == [200, ""]
+      expect(@response.status).to eq([200, ""])
     end
 
     it "should return assigned status" do
-      @response = WebMock::Response.new(:status => 500)
-      @response.status.should == [500, ""]
+      @response = WebMock::Response.new(status: 500)
+      expect(@response.status).to eq([500, ""])
     end
 
     it "should return assigned message" do
-      @response = WebMock::Response.new(:status => [500, "Internal Server Error"])
-      @response.status.should == [500, "Internal Server Error"]
+      @response = WebMock::Response.new(status: [500, "Internal Server Error"])
+      expect(@response.status).to eq([500, "Internal Server Error"])
     end
-
   end
 
   describe "raising error" do
 
     it "should raise error if any assigned" do
-      @response = WebMock::Response.new(:exception => ArgumentError)
-      lambda {
+      @response = WebMock::Response.new(exception: ArgumentError)
+      expect {
         @response.raise_error_if_any
-      }.should raise_error(ArgumentError, "Exception from WebMock")
+      }.to raise_error(ArgumentError, "Exception from WebMock")
     end
 
     it "should raise error if any assigned as instance" do
-      @response = WebMock::Response.new(:exception => ArgumentError.new("hello world"))
-      lambda {
+      @response = WebMock::Response.new(exception: ArgumentError.new("hello world"))
+      expect {
         @response.raise_error_if_any
-      }.should raise_error(ArgumentError, "hello world")
+      }.to raise_error(ArgumentError, "hello world")
     end
 
     it "should raise error if any assigned as string" do
-      @response = WebMock::Response.new(:exception => "hello world")
-      lambda {
+      @response = WebMock::Response.new(exception: "hello world")
+      expect {
         @response.raise_error_if_any
-      }.should raise_error("hello world")
+      }.to raise_error("hello world")
     end
 
     it "should not raise error if no error assigned" do
@@ -82,13 +84,13 @@ describe WebMock::Response do
   describe "timeout" do
 
     it "should know if it should timeout" do
-      @response = WebMock::Response.new(:should_timeout => true)
-      @response.should_timeout.should be_true
+      @response = WebMock::Response.new(should_timeout: true)
+      expect(@response.should_timeout).to be_truthy
     end
 
     it "should not timeout by default" do
       @response = WebMock::Response.new
-      @response.should_timeout.should be_false
+      expect(@response.should_timeout).to be_falsey
     end
 
   end
@@ -96,30 +98,47 @@ describe WebMock::Response do
   describe "body" do
 
     it "should return empty body by default" do
-      @response.body.should == ''
+      expect(@response.body).to eq('')
     end
 
     it "should report body if assigned" do
-      @response = WebMock::Response.new(:body => "abc")
-      @response.body.should == "abc"
+      @response = WebMock::Response.new(body: "abc")
+      expect(@response.body).to eq("abc")
     end
 
     it "should report string even if existing file path was provided" do
-      @response = WebMock::Response.new(:body => __FILE__)
-      @response.body.should == __FILE__
+      @response = WebMock::Response.new(body: __FILE__)
+      expect(@response.body).to eq(__FILE__)
     end
 
     it "should report content of a IO object if provided" do
-      @response = WebMock::Response.new(:body => File.new(__FILE__))
-      @response.body.should == File.new(__FILE__).read
+      @response = WebMock::Response.new(body: File.new(__FILE__))
+      expect(@response.body).to eq(File.read(__FILE__))
     end
 
     it "should report many times content of a IO object if provided" do
-      @response = WebMock::Response.new(:body => File.new(__FILE__))
-      @response.body.should == File.new(__FILE__).read
-      @response.body.should == File.new(__FILE__).read
+      @response = WebMock::Response.new(body: File.new(__FILE__))
+      expect(@response.body).to eq(File.read(__FILE__))
+      expect(@response.body).to eq(File.read(__FILE__))
+    end
+
+    it "should work with Pathnames" do
+      @response = WebMock::Response.new(body: Pathname.new(__FILE__))
+      expect(@response.body).to eq(File.read(__FILE__))
+    end
+
+    # Users of webmock commonly make the mistake of stubbing the response
+    # body to return a hash, to prevent this:
+    #
+    it "should error if given a non-allowed type: a hash" do
+      expect { WebMock::Response.new(body: Hash.new) }.to \
+        raise_error(WebMock::Response::InvalidBody)
     end
 
+    it "should error if given a non-allowed type: something that is not a hash" do
+      expect { WebMock::Response.new(body: 123) }.to \
+        raise_error(WebMock::Response::InvalidBody)
+    end
   end
 
   describe "from raw response" do
@@ -132,57 +151,57 @@ describe WebMock::Response do
 
 
       it "should read status" do
-        @response.status.should == [202, "OK"]
+        expect(@response.status).to eq([202, "OK"])
       end
 
       it "should read headers" do
-        @response.headers.should == {
-          "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
-          "Content-Type"=>"text/html; charset=UTF-8",
-          "Content-Length"=>"419",
-          "Connection"=>"Keep-Alive",
-          "Accept"=>"image/jpeg, image/png"
-          }
+        expect(@response.headers).to eq({
+                                          "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
+                                          "Content-Type"=>"text/html; charset=UTF-8",
+                                          "Content-Length"=>"419",
+                                          "Connection"=>"Keep-Alive",
+                                          "Accept"=>"image/jpeg, image/png"
+        })
       end
 
       it "should read body" do
-        @response.body.size.should == 419
+        expect(@response.body.size).to eq(419)
       end
 
       it "should close IO" do
-        @file.should be_closed
+        expect(@file).to be_closed
       end
 
     end
 
     describe "when input is String" do
       before(:each) do
-        @input = File.new(CURL_EXAMPLE_OUTPUT_PATH).read
+        @input = File.read(CURL_EXAMPLE_OUTPUT_PATH)
         @response = WebMock::Response.new(@input)
       end
 
       it "should read status" do
-        @response.status.should == [202, "OK"]
+        expect(@response.status).to eq([202, "OK"])
       end
 
       it "should read headers" do
-        @response.headers.should == {
-          "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
-          "Content-Type"=>"text/html; charset=UTF-8",
-          "Content-Length"=>"419",
-          "Connection"=>"Keep-Alive",
-          "Accept"=>"image/jpeg, image/png"
-          }
+        expect(@response.headers).to eq({
+                                          "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
+                                          "Content-Type"=>"text/html; charset=UTF-8",
+                                          "Content-Length"=>"419",
+                                          "Connection"=>"Keep-Alive",
+                                          "Accept"=>"image/jpeg, image/png"
+        })
       end
 
       it "should read body" do
-        @response.body.size.should == 419
+        expect(@response.body.size).to eq(419)
       end
 
       it "should work with transfer-encoding set to chunked" do
         @input.gsub!("Content-Length: 419", "Transfer-Encoding: chunked")
         @response = WebMock::Response.new(@input)
-        @response.body.size.should == 419
+        expect(@response.body.size).to eq(419)
       end
 
     end
@@ -190,22 +209,22 @@ describe WebMock::Response do
     describe "with dynamically evaluated options" do
 
       before(:each) do
-        @request_signature = WebMock::RequestSignature.new(:post, "www.example.com", :body => "abc", :headers => {'A' => 'a'})
+        @request_signature = WebMock::RequestSignature.new(:post, "www.example.com", body: "abc", headers: {'A' => 'a'})
       end
 
       it "should have evaluated body" do
-        @response = WebMock::Response.new(:body => lambda {|request| request.body})
-        @response.evaluate(@request_signature).body.should == "abc"
+        @response = WebMock::Response.new(body: lambda {|request| request.body})
+        expect(@response.evaluate(@request_signature).body).to eq("abc")
       end
 
       it "should have evaluated headers" do
-        @response = WebMock::Response.new(:headers => lambda {|request| request.headers})
-        @response.evaluate(@request_signature).headers.should == {'A' => 'a'}
+        @response = WebMock::Response.new(headers: lambda {|request| request.headers})
+        expect(@response.evaluate(@request_signature).headers).to eq({'A' => 'a'})
       end
 
       it "should have evaluated status" do
-        @response = WebMock::Response.new(:status => lambda {|request| 302})
-        @response.evaluate(@request_signature).status.should == [302, ""]
+        @response = WebMock::Response.new(status: lambda {|request| 302})
+        expect(@response.evaluate(@request_signature).status).to eq([302, ""])
       end
 
     end
@@ -217,25 +236,25 @@ describe WebMock::Response do
     describe "evaluating response options" do
 
       it "should evaluate new response with evaluated options" do
-        request_signature = WebMock::RequestSignature.new(:post, "www.example.com", :body => "abc", :headers => {'A' => 'a'})
+        request_signature = WebMock::RequestSignature.new(:post, "www.example.com", body: "abc", headers: {'A' => 'a'})
         response = WebMock::DynamicResponse.new(lambda {|request|
-          {
-            :body => request.body,
-            :headers => request.headers,
-            :status => 302
-          }
+                                                  {
+                                                    body: request.body,
+                                                    headers: request.headers,
+                                                    status: 302
+                                                  }
         })
         evaluated_response = response.evaluate(request_signature)
-        evaluated_response.body.should == "abc"
-        evaluated_response.headers.should == {'A' => 'a'}
-        evaluated_response.status.should == [302, ""]
+        expect(evaluated_response.body).to eq("abc")
+        expect(evaluated_response.headers).to eq({'A' => 'a'})
+        expect(evaluated_response.status).to eq([302, ""])
       end
 
       it "should be equal to static response after evaluation" do
-        request_signature = WebMock::RequestSignature.new(:post, "www.example.com", :body => "abc")
-        response = WebMock::DynamicResponse.new(lambda {|request| {:body => request.body}})
+        request_signature = WebMock::RequestSignature.new(:post, "www.example.com", body: "abc")
+        response = WebMock::DynamicResponse.new(lambda {|request| {body: request.body}})
         evaluated_response = response.evaluate(request_signature)
-        evaluated_response.should == WebMock::Response.new(:body => "abc")
+        expect(evaluated_response).to eq(WebMock::Response.new(body: "abc"))
       end
 
       describe "when raw response is evaluated" do
@@ -249,14 +268,14 @@ describe WebMock::Response do
         describe "as a file" do
           it "should return response" do
             response = WebMock::DynamicResponse.new(lambda {|request| @files[request.uri.host.to_s] })
-            response.evaluate(@request_signature).body.size.should == 419
+            expect(response.evaluate(@request_signature).body.size).to eq(419)
           end
         end
 
         describe "as a string" do
           it "should return response" do
             response = WebMock::DynamicResponse.new(lambda {|request| @files[request.uri.host.to_s].read })
-            response.evaluate(@request_signature).body.size.should == 419
+            expect(response.evaluate(@request_signature).body.size).to eq(419)
           end
         end
       end

data/spec/unit/stub_registry_spec.rb

@@ -9,31 +9,40 @@ describe WebMock::StubRegistry do
     @request_stub = WebMock::RequestStub.new(:get, "www.example.com")
   end
 
+  describe "remove_request_stub" do
+    it "should remove stub from registry" do
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub)
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(@request_stub)
+      WebMock::StubRegistry.instance.remove_request_stub(@request_stub)
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(nil)
+    end
+  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
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(@request_stub)
       WebMock::StubRegistry.instance.reset!
-      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == nil
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(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
+      expect(WebMock::StubRegistry.instance.register_request_stub(@request_stub)).to eq(@request_stub)
     end
 
     it "should report if request stub is not registered" do
-      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == nil
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(nil)
     end
 
-    it "should register and report registered stib" do
+    it "should register and report registered stub" do
       WebMock::StubRegistry.instance.register_request_stub(@request_stub)
-      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == @request_stub
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(@request_stub)
     end
 
 
@@ -42,43 +51,51 @@ describe WebMock::StubRegistry do
   describe "response for request" do
 
     it "should report registered evaluated response for request pattern" do
-      @request_stub.to_return(:body => "abc")
+      @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")
+      expect(WebMock::StubRegistry.instance.response_for_request(@request_signature)).
+        to eq(WebMock::Response.new(body: "abc"))
     end
 
     it "should report evaluated response" do
-      @request_stub.to_return {|request| {:body => request.method.to_s} }
+      @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")
+      expect(response1).to eq(WebMock::Response.new(body: "get"))
+    end
+
+    it "should report clone of the response" do
+      @request_stub.to_return(body: lambda{|r| r.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)
+      expect(response1).not_to be(response2)
     end
 
-    it "should report clone of theresponse" do
-      @request_stub.to_return {|request| {:body => request.method.to_s} }
+    it "should report clone of the dynamic 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)
       response2 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
-      response1.should_not be(response2)
+      expect(response1).not_to 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
+      expect(WebMock::StubRegistry.instance.response_for_request(@request_signature)).to eq(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_stub1.to_return(body: "abc")
       @request_stub2 = WebMock::RequestStub.new(:get, "www.example.com")
-      @request_stub2.to_return(:body => "def")
+      @request_stub2.to_return(body: "def")
       @request_stub3 = WebMock::RequestStub.new(:get, "www.example.org")
-      @request_stub3.to_return(:body => "ghj")
+      @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")
+      expect(WebMock::StubRegistry.instance.response_for_request(@request_signature)).
+        to eq(WebMock::Response.new(body: "def"))
     end
 
   end

data/spec/unit/stub_request_snippet_spec.rb

@@ -4,57 +4,57 @@ describe WebMock::StubRequestSnippet do
   describe "to_s" do
     describe "GET" do
       before(:each) do
-        @request_signature = WebMock::RequestSignature.new(:get, "www.example.com/?a=b&c=d", :headers => {})
+        @request_signature = WebMock::RequestSignature.new(:get, "www.example.com/?a=b&c=d", headers: {})
       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 => {}))
+        expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").\n  to_return(status: 200, body: "", headers: {}))
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(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 => {})"
+        "\n  with(\n    body: \"abcdef\")." +
+        "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(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 => {})"
+        "\n  with(\n    body: \"abc\\ndef\")." +
+        "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(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 => {})"
+        "\n  with(\n    headers: {\n\t\  'A\'=>\'a\',\n\t  \'B\'=>\'b\'\n    })." +
+        "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(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 => {})"
+        "\n  with(\n    body: \"abcdef\",\n    headers: {\n\t  \'A\'=>\'a\',\n\t  \'B\'=>\'b\'\n    })." +
+        "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
 
       it "should not print to_return part if not wanted" do
         expected = 'stub_request(:get, "http://www.example.com/").'+
-        "\n  with(:body => \"abcdef\")"
-        stub = WebMock::RequestStub.new(:get, "www.example.com").with(:body => "abcdef").to_return(:body => "hello")
-        WebMock::StubRequestSnippet.new(stub).to_s(false).should == expected
+        "\n  with(\n    body: \"abcdef\")"
+        stub = WebMock::RequestStub.new(:get, "www.example.com").with(body: "abcdef").to_return(body: "hello")
+        expect(WebMock::StubRequestSnippet.new(stub).to_s(false)).to eq(expected)
       end
     end
 
@@ -63,33 +63,53 @@ describe WebMock::StubRequestSnippet do
       let(:multipart_form_body) { 'complicated stuff--ABC123--goes here' }
       it "should print stub request snippet with body as a hash using rails conventions on form posts" do
         @request_signature = WebMock::RequestSignature.new(:post, "www.example.com",
-                   :headers => {'Content-Type' => 'application/x-www-form-urlencoded'},
-                   :body => form_body)
+                   headers: {'Content-Type' => 'application/x-www-form-urlencoded'},
+                   body: form_body)
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expected = <<-STUB
 stub_request(:post, "http://www.example.com/").
-  with(:body => {"user"=>{"first_name"=>"Bartosz"}},
-       :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
-  to_return(:status => 200, :body => \"\", :headers => {})
+  with(
+    body: {"user"=>{"first_name"=>"Bartosz"}},
+    headers: {
+\t  'Content-Type'=>'application/x-www-form-urlencoded'
+    }).
+  to_return(status: 200, body: \"\", headers: {})
         STUB
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected.strip
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected.strip)
       end
 
       it "should print stub request snippet leaving body as string when not a urlencoded form" do
         @request_signature = WebMock::RequestSignature.new(:post, "www.example.com",
-                   :headers => {'Content-Type' => 'multipart/form-data; boundary=ABC123'},
-                   :body => multipart_form_body)
+                   headers: {'Content-Type' => 'multipart/form-data; boundary=ABC123'},
+                   body: multipart_form_body)
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expected = <<-STUB
 stub_request(:post, "http://www.example.com/").
-  with(:body => "#{multipart_form_body}",
-       :headers => {'Content-Type'=>'multipart/form-data; boundary=ABC123'}).
-  to_return(:status => 200, :body => \"\", :headers => {})
+  with(
+    body: "#{multipart_form_body}",
+    headers: {
+\t  'Content-Type'=>'multipart/form-data; boundary=ABC123'
+    }).
+  to_return(status: 200, body: \"\", headers: {})
         STUB
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected.strip
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected.strip)
       end
-    end
 
+      it "should print stub request snippet with valid JSON body when request header contains 'Accept'=>'application/json' " do
+        @request_signature = WebMock::RequestSignature.new(:post, "www.example.com",
+                   headers: {'Accept' => 'application/json'})
+        @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
+        expected = <<-STUB
+stub_request(:post, "http://www.example.com/").
+  with(
+    headers: {
+\t  'Accept'=>'application/json'
+    }).
+  to_return(status: 200, body: \"{}\", headers: {})
+        STUB
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected.strip)
+      end
+    end
 
   end
 end

data/spec/unit/util/hash_counter_spec.rb

@@ -3,22 +3,22 @@ require 'spec_helper'
 describe WebMock::Util::HashCounter do
 
   it "should return 0 for non existing key" do
-    WebMock::Util::HashCounter.new.get(:abc).should == 0
+    expect(WebMock::Util::HashCounter.new.get(:abc)).to eq(0)
   end
 
   it "should increase the returned value on every put with the same key" do
     counter = WebMock::Util::HashCounter.new
     counter.put(:abc)
-    counter.get(:abc).should == 1
+    expect(counter.get(:abc)).to eq(1)
     counter.put(:abc)
-    counter.get(:abc).should == 2
+    expect(counter.get(:abc)).to eq(2)
   end
 
   it "should only increase value for given key provided to put" do
     counter = WebMock::Util::HashCounter.new
     counter.put(:abc)
-    counter.get(:abc).should == 1
-    counter.get(:def).should == 0
+    expect(counter.get(:abc)).to eq(1)
+    expect(counter.get(:def)).to eq(0)
   end
 
   describe "each" do
@@ -33,7 +33,7 @@ describe WebMock::Util::HashCounter do
 
       elements = []
       counter.each {|k,v| elements << [k,v]}
-      elements.should == [[:c, 1], [:b, 2], [:a, 2], [:d, 1]]
+      expect(elements).to eq([[:c, 1], [:b, 2], [:a, 2], [:d, 1]])
     end
   end
 end