webmock 1.8.6 → 3.14.0

data/spec/acceptance/shared/callbacks.rb

@@ -1,6 +1,7 @@
 shared_context "callbacks" do |*adapter_info|
   describe "when after_request callback is declared" do
     before(:each) do
+      @called = nil
       WebMock.reset_callbacks
       stub_request(:get, "http://www.example.com")
     end
@@ -9,7 +10,7 @@ shared_context "callbacks" do |*adapter_info|
       WebMock.after_request {
         @called = true
       }
-      @called.should == nil
+      expect(@called).to eq(nil)
     end
 
     it "should invoke a callback after request is made" do
@@ -17,31 +18,31 @@ shared_context "callbacks" do |*adapter_info|
         @called = true
       }
       http_request(:get, "http://www.example.com/")
-      @called.should == true
+      expect(@called).to eq(true)
     end
 
     it "should not invoke a callback if this http library should be ignored" do
-      WebMock.after_request(:except => [http_library()]) {
+      WebMock.after_request(except: [http_library()]) {
         @called = true
       }
       http_request(:get, "http://www.example.com/")
-      @called.should == nil
+      expect(@called).to eq(nil)
     end
 
     it "should invoke a callback even if other http libraries should be ignored" do
-      WebMock.after_request(:except => [:other_lib]) {
+      WebMock.after_request(except: [:other_lib]) {
         @called = true
       }
       http_request(:get, "http://www.example.com/")
-      @called.should == true
+      expect(@called).to eq(true)
     end
 
     it "should pass request signature to the callback" do
-      WebMock.after_request(:except => [:other_lib])  do |request_signature, _|
+      WebMock.after_request(except: [:other_lib])  do |request_signature, _|
         @request_signature = request_signature
       end
       http_request(:get, "http://www.example.com/")
-      @request_signature.uri.to_s.should == "http://www.example.com:80/"
+      expect(@request_signature.uri.to_s).to eq("http://www.example.com:80/")
     end
 
     after(:each) do
@@ -60,7 +61,7 @@ shared_context "callbacks" do |*adapter_info|
       end
 
       http_request(:get, "http://www.example.com/")
-      global_stub_request_sig.should be(after_request_request_sig)
+      expect(global_stub_request_sig).to be(after_request_request_sig)
     end
 
     context "passing response to callback" do
@@ -68,53 +69,54 @@ shared_context "callbacks" do |*adapter_info|
         before(:each) do
           stub_request(:get, "http://www.example.com").
           to_return(
-            :status => ["200", "hello"],
-            :headers => {'Content-Length' => '666', 'Hello' => 'World'},
-            :body => "foo bar"
+            status: [200, "hello"],
+            headers: {'Content-Length' => '666', 'Hello' => 'World'},
+            body: "foo bar"
           )
-          WebMock.after_request(:except => [:other_lib])  do |_, response|
+          WebMock.after_request(except: [:other_lib])  do |_, response|
             @response = response
           end
           http_request(:get, "http://www.example.com/")
         end
 
         it "should pass response to callback with the status and message" do
-          @response.status.should == ["200", "hello"]
+          expect(@response.status).to eq([200, "hello"])
         end
 
         it "should pass response to callback with headers" do
-          @response.headers.should == {
+          expect(@response.headers).to eq({
             'Content-Length' => '666',
             'Hello' => 'World'
-          }
+          })
         end
 
         it "should pass response to callback with body" do
-          @response.body.should == "foo bar"
+          expect(@response.body).to eq("foo bar")
         end
       end
 
-      describe "when request is not stubbed", :net_connect => true do
+      describe "when request is not stubbed", net_connect: true do
         before(:each) do
           WebMock.reset!
           WebMock.allow_net_connect!
-          WebMock.after_request(:except => [:other_lib])  do |_, response|
+          WebMock.after_request(except: [:other_lib])  do |_, response|
             @response = response
           end
-          http_request(:get, "http://www.example.com/")
+          http_request(:get, "http://httpstat.us/201", headers: { "Accept" => "*" })
         end
 
         it "should pass real response to callback with status and message" do
-          @response.status[0].should == 302
-          @response.status[1].should == "Found" unless adapter_info.include?(:no_status_message)
+          expect(@response.status[0]).to eq(201)
+          expect(@response.status[1]).to eq("Created") unless adapter_info.include?(:no_status_message)
         end
 
         it "should pass real response to callback with headers" do
-          @response.headers["Content-Length"].should == "0"
+          expect(@response.headers["X-Powered-By"]).to eq( "ASP.NET")
+          expect(@response.headers["Content-Length"]).to eq("11") unless adapter_info.include?(:no_content_length_header)
         end
 
         it "should pass response to callback with body" do
-          @response.body.size.should == 0
+          expect(@response.body.size).to eq(11)
         end
       end
     end
@@ -123,16 +125,16 @@ shared_context "callbacks" do |*adapter_info|
       WebMock.after_request { @called = 1 }
       WebMock.after_request { @called += 1 }
       http_request(:get, "http://www.example.com/")
-      @called.should == 2
+      expect(@called).to eq(2)
     end
 
-    it "should invoke callbacks only for real requests if requested", :net_connect => true do
-      WebMock.after_request(:real_requests_only => true) { @called = true }
+    it "should invoke callbacks only for real requests if requested", net_connect: true do
+      WebMock.after_request(real_requests_only: true) { @called = true }
       http_request(:get, "http://www.example.com/")
-      @called.should == nil
+      expect(@called).to eq(nil)
       WebMock.allow_net_connect!
       http_request(:get, "http://www.example.net/")
-      @called.should == true
+      expect(@called).to eq(true)
     end
 
     it "should not invoke any callbacks after callbacks were reset" do
@@ -140,7 +142,7 @@ shared_context "callbacks" do |*adapter_info|
       WebMock.reset_callbacks
       stub_request(:get, "http://www.example.com/")
       http_request(:get, "http://www.example.com/")
-      @called.should == nil
+      expect(@called).to eq(nil)
     end
   end
 end

data/spec/acceptance/shared/complex_cross_concern_behaviors.rb

@@ -7,15 +7,30 @@ shared_context "complex cross-concern behaviors" do |*adapter_info|
     real_response = http_request(:get, webmock_server_url)
 
     stub_request(:get, webmock_server_url).to_return(
-      :status => recorded_response.status,
-      :body => recorded_response.body,
-      :headers => recorded_response.headers
+      status: recorded_response.status,
+      body: recorded_response.body,
+      headers: recorded_response.headers
     )
 
     played_back_response = http_request(:get, webmock_server_url)
 
-    played_back_response.headers.keys.should include('Set-Cookie')
-    played_back_response.should == real_response
+    expect(played_back_response.headers.keys).to include('Set-Cookie')
+    expect(played_back_response).to eq(real_response)
+  end
+
+  let(:no_content_url) { 'http://httpstat.us/204' }
+  [nil, ''].each do |stub_val|
+    it "returns the same value (nil or "") for a request stubbed as #{stub_val.inspect} that a real empty response has", net_connect: true do
+      unless http_library == :curb
+        WebMock.allow_net_connect!
+
+        real_response = http_request(:get, no_content_url)
+        stub_request(:get, no_content_url).to_return(status: 204, body: stub_val)
+        stubbed_response = http_request(:get, no_content_url)
+
+        expect(stubbed_response.body).to eq(real_response.body)
+      end
+    end
   end
 end
 

data/spec/acceptance/shared/enabling_and_disabling_webmock.rb

@@ -19,7 +19,7 @@ shared_context "enabled and disabled webmock" do |*adapter_info|
 
   describe "when webmock is disabled except this lib" do
     before(:each) do
-      WebMock.disable!(:except => [http_library])
+      WebMock.disable!(except: [http_library])
     end
     after(:each) do
       WebMock.enable!
@@ -30,7 +30,7 @@ shared_context "enabled and disabled webmock" do |*adapter_info|
   describe "when webmock is enabled except this lib" do
     before(:each) do
       WebMock.disable!
-      WebMock.enable!(:except => [http_library])
+      WebMock.enable!(except: [http_library])
     end
     after(:each) do
       WebMock.enable!
@@ -42,18 +42,18 @@ end
 shared_context "disabled WebMock" do
   it "should not register executed requests" do
     http_request(:get, webmock_server_url)
-    a_request(:get, webmock_server_url).should_not have_been_made
+    expect(a_request(:get, webmock_server_url)).not_to have_been_made
   end
 
   it "should not block unstubbed requests" do
-    lambda {
+    expect {
       http_request(:get, webmock_server_url)
-    }.should_not raise_error
+    }.not_to raise_error
   end
 
   it "should return real response even if there are stubs" do
-    stub_request(:get, /.*/).to_return(:body => "x")
-    http_request(:get, webmock_server_url).body.should == "hello world"
+    stub_request(:get, /.*/).to_return(body: "x")
+    expect(http_request(:get, webmock_server_url).body).to eq("hello world")
   end
 
   it "should not invoke any callbacks" do
@@ -62,7 +62,7 @@ shared_context "disabled WebMock" do
     @called = nil
     WebMock.after_request { @called = 1 }
     http_request(:get, webmock_server_url)
-    @called.should == nil
+    expect(@called).to eq(nil)
   end
 end
 
@@ -70,18 +70,18 @@ shared_context "enabled WebMock" do
   it "should register executed requests" do
     WebMock.allow_net_connect!
     http_request(:get, webmock_server_url)
-    a_request(:get, webmock_server_url).should have_been_made
+    expect(a_request(:get, webmock_server_url)).to have_been_made
   end
 
   it "should block unstubbed requests" do
-    lambda {
+    expect {
       http_request(:get, "http://www.example.com/")
-    }.should raise_error(WebMock::NetConnectNotAllowedError)
+    }.to raise_error(WebMock::NetConnectNotAllowedError)
   end
 
   it "should return stubbed response" do
-    stub_request(:get, /.*/).to_return(:body => "x")
-    http_request(:get, "http://www.example.com/").body.should == "x"
+    stub_request(:get, /.*/).to_return(body: "x")
+    expect(http_request(:get, "http://www.example.com/").body).to eq("x")
   end
 
   it "should invoke callbacks" do
@@ -90,6 +90,6 @@ shared_context "enabled WebMock" do
     @called = nil
     WebMock.after_request { @called = 1 }
     http_request(:get, webmock_server_url)
-    @called.should == 1
+    expect(@called).to eq(1)
   end
 end

data/spec/acceptance/shared/precedence_of_stubs.rb

@@ -1,15 +1,15 @@
 shared_context "precedence of stubs" do |*adapter_info|
   describe "when choosing a matching request stub" do
     it "should use the last declared matching request stub" do
-      stub_request(:get, "www.example.com").to_return(:body => "abc")
-      stub_request(:get, "www.example.com").to_return(:body => "def")
-      http_request(:get, "http://www.example.com/").body.should == "def"
+      stub_request(:get, "www.example.com").to_return(body: "abc")
+      stub_request(:get, "www.example.com").to_return(body: "def")
+      expect(http_request(:get, "http://www.example.com/").body).to eq("def")
     end
 
     it "should not be affected by the type of uri or request method" do
-      stub_request(:get, "www.example.com").to_return(:body => "abc")
-      stub_request(:any, /.*example.*/).to_return(:body => "def")
-      http_request(:get, "http://www.example.com/").body.should == "def"
+      stub_request(:get, "www.example.com").to_return(body: "abc")
+      stub_request(:any, /.*example.*/).to_return(body: "def")
+      expect(http_request(:get, "http://www.example.com/").body).to eq("def")
     end
   end
 end