webmock 1.20.3 → 1.20.4

data/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb

@@ -50,7 +50,7 @@ unless RUBY_PLATFORM =~ /java/
           hydra.queue(request)
           hydra.run
 
-          request.response.should be_timed_out
+          expect(request.response).to be_timed_out
         end
       end
 
@@ -69,7 +69,7 @@ unless RUBY_PLATFORM =~ /java/
           end
           hydra.queue @request
           hydra.run
-          test.should == body
+          expect(test).to eq(body)
         end
 
         it "should call on_complete with 5xx response" do
@@ -82,7 +82,7 @@ unless RUBY_PLATFORM =~ /java/
           end
           hydra.queue @request
           hydra.run
-          test.should == response_code
+          expect(test).to eq(response_code)
         end
 
         it "should call on_body with 2xx response" do
@@ -91,7 +91,7 @@ unless RUBY_PLATFORM =~ /java/
 
           test_body = nil
           test_complete = nil
-          pending("This test requires a newer version of Typhoeus") unless @request.respond_to?(:on_body)
+          skip("This test requires a newer version of Typhoeus") unless @request.respond_to?(:on_body)
           @request.on_body do |body, response|
             test_body = body
           end
@@ -100,8 +100,8 @@ unless RUBY_PLATFORM =~ /java/
           end
           hydra.queue @request
           hydra.run
-          test_body.should == body
-          test_complete.should == ""
+          expect(test_body).to eq(body)
+          expect(test_complete).to eq("")
         end
 
         it "should call on_headers with 2xx response" do
@@ -109,13 +109,13 @@ unless RUBY_PLATFORM =~ /java/
           stub_request(:any, "example.com").to_return(:body => body, :headers => {'X-Test' => '1'})
 
           test_headers = nil
-          pending("This test requires a newer version of Typhoeus") unless @request.respond_to?(:on_headers)
+          skip("This test requires a newer version of Typhoeus") unless @request.respond_to?(:on_headers)
           @request.on_headers do |response|
             test_headers = response.headers
           end
           hydra.queue @request
           hydra.run
-          test_headers.should include('X-Test' => '1')
+          expect(test_headers).to include('X-Test' => '1')
         end
       end
     end

data/spec/quality_spec.rb

@@ -51,7 +51,7 @@ describe "The library itself" do
   end
 
   RSpec::Matchers.define :be_well_formed do
-    failure_message_for_should do |actual|
+    failure_message do |actual|
       actual.join("\n")
     end
 
@@ -69,13 +69,13 @@ describe "The library itself" do
         error_messages << check_for_extra_spaces(filename)
       end
     end
-    error_messages.compact.should be_well_formed
+    expect(error_messages.compact).to be_well_formed
   end
 
   it "can still be built" do
     Dir.chdir(File.expand_path('../../', __FILE__)) do
       `gem build webmock.gemspec`
-      $?.should == 0
+      expect($?).to eq(0)
 
       # clean up the .gem generated
       system("rm webmock-#{WebMock.version}.gem")

data/spec/spec_helper.rb

@@ -53,9 +53,3 @@ end
 def fail_with(message)
   raise_error(RSpec::Expectations::ExpectationNotMetError, message)
 end
-
-class Proc
-  def should_pass
-    lambda { self.call }.should_not raise_error
-  end
-end

data/spec/unit/errors_spec.rb

@@ -4,8 +4,8 @@ describe "errors" do
   describe WebMock::NetConnectNotAllowedError do
     describe "message" do
       it "should have message with request signature and snippet" do
-        WebMock::RequestStub.stub(:from_request_signature).and_return(request_stub)
-        WebMock::StubRequestSnippet.stub(:new).
+        allow(WebMock::RequestStub).to receive(:from_request_signature).and_return(request_stub)
+        allow(WebMock::StubRequestSnippet).to receive(:new).
            with(request_stub).and_return(stub_result)
 
         expected =  \
@@ -13,13 +13,13 @@ describe "errors" do
           "\n\nYou can stub this request with the following snippet:" \
           "\n\n#{stub_result}" \
           "\n\n============================================================"
-        WebMock::NetConnectNotAllowedError.new(request_signature).message.should == expected
+        expect(WebMock::NetConnectNotAllowedError.new(request_signature).message).to eq(expected)
       end
 
       it "should have message with registered stubs if available" do
-        WebMock::StubRegistry.instance.stub(:request_stubs).and_return([request_stub])
-        WebMock::RequestStub.stub(:from_request_signature).and_return(request_stub)
-        WebMock::StubRequestSnippet.stub(:new).
+        allow(WebMock::StubRegistry.instance).to receive(:request_stubs).and_return([request_stub])
+        allow(WebMock::RequestStub).to receive(:from_request_signature).and_return(request_stub)
+        allow(WebMock::StubRequestSnippet).to receive(:new).
            with(request_stub).and_return(stub_result)
 
         expected =  \
@@ -29,12 +29,12 @@ describe "errors" do
           "\n\nregistered request stubs:" \
           "\n\n#{stub_result}" \
           "\n\n============================================================"
-        WebMock::NetConnectNotAllowedError.new(request_signature).message.should == expected
+        expect(WebMock::NetConnectNotAllowedError.new(request_signature).message).to eq(expected)
       end
 
       it "should not be caught by a rescue block without arguments" do
-        WebMock::RequestStub.stub(:from_request_signature).and_return(request_stub)
-        WebMock::StubRequestSnippet.stub(:new).
+        allow(WebMock::RequestStub).to receive(:from_request_signature).and_return(request_stub)
+        allow(WebMock::StubRequestSnippet).to receive(:new).
           with(request_stub).and_return(stub_result)
 
         exception = WebMock::NetConnectNotAllowedError.new(request_signature)
@@ -54,20 +54,20 @@ describe "errors" do
         end
 
         it "should have message with request signature and snippet" do
-          WebMock::RequestStub.stub(:from_request_signature).and_return(request_stub)
-          WebMock::StubRequestSnippet.stub(:new).
+          allow(WebMock::RequestStub).to receive(:from_request_signature).and_return(request_stub)
+          allow(WebMock::StubRequestSnippet).to receive(:new).
             with(request_stub).and_return(stub_result)
 
           expected =  \
             "Real HTTP connections are disabled. Unregistered request: #{request_signature}" \
             "\n\n============================================================"
-          WebMock::NetConnectNotAllowedError.new(request_signature).message.should == expected
+          expect(WebMock::NetConnectNotAllowedError.new(request_signature).message).to eq(expected)
         end
 
         it "should have message with registered stubs if available" do
-          WebMock::StubRegistry.instance.stub(:request_stubs).and_return([request_stub])
-          WebMock::RequestStub.stub(:from_request_signature).and_return(request_stub)
-          WebMock::StubRequestSnippet.stub(:new).
+          allow(WebMock::StubRegistry.instance).to receive(:request_stubs).and_return([request_stub])
+          allow(WebMock::RequestStub).to receive(:from_request_signature).and_return(request_stub)
+          allow(WebMock::StubRequestSnippet).to receive(:new).
             with(request_stub).and_return(stub_result)
 
           expected =  \
@@ -75,7 +75,7 @@ describe "errors" do
             "\n\nregistered request stubs:" \
             "\n\n#{stub_result}" \
             "\n\n============================================================"
-          WebMock::NetConnectNotAllowedError.new(request_signature).message.should == expected
+          expect(WebMock::NetConnectNotAllowedError.new(request_signature).message).to eq(expected)
         end
       end
     end

data/spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb

@@ -9,7 +9,7 @@ describe WebMock::HttpLibAdapterRegistry do
       WebMock::HttpLibAdapterRegistry.instance.each_adapter {|n,a|
         adapters << [n, a]
       }
-      adapters.should include([:my_lib, MyAdapter])
+      expect(adapters).to include([:my_lib, MyAdapter])
       WebMock::HttpLibAdapterRegistry.instance.
         http_lib_adapters.delete(:my_lib)
     end

data/spec/unit/http_lib_adapters/http_lib_adapter_spec.rb

@@ -4,8 +4,8 @@ describe WebMock::HttpLibAdapter do
   describe "adapter_for" do
     it "should add adapter to adapter registry" do
       class MyAdapter < WebMock::HttpLibAdapter; end
-      WebMock::HttpLibAdapterRegistry.instance.
-        should_receive(:register).with(:my_lib, MyAdapter)
+      expect(WebMock::HttpLibAdapterRegistry.instance).
+        to receive(:register).with(:my_lib, MyAdapter)
       MyAdapter.adapter_for(:my_lib)
     end
   end

data/spec/unit/rack_response_spec.rb

@@ -10,16 +10,16 @@ describe WebMock::RackResponse do
     request = WebMock::RequestSignature.new(:get, 'www.example.com')
     response = @rack_response.evaluate(request)
 
-    response.status.first.should == 200
-    response.body.should include('This is my root!')
+    expect(response.status.first).to eq(200)
+    expect(response.body).to include('This is my root!')
   end
 
   it "should behave correctly when the rack response is not a simple array of strings" do
     request = WebMock::RequestSignature.new(:get, 'www.example.com/non_array_response')
     response = @rack_response.evaluate(request)
 
-    response.status.first.should == 200
-    response.body.should include('This is not in an array!')
+    expect(response.status.first).to eq(200)
+    expect(response.body).to include('This is not in an array!')
   end
 
   it "should shouldn't blow up when hitting a locked resource twice" do
@@ -28,8 +28,8 @@ describe WebMock::RackResponse do
     response  = @locked_rack_response.evaluate(request)
     response2 = @locked_rack_response.evaluate(request)
 
-    response2.body.should include('Single threaded response.')
-    response2.status.first.should == 200
+    expect(response2.body).to include('Single threaded response.')
+    expect(response2.status.first).to eq(200)
   end
 
   it "should send along params" do
@@ -37,8 +37,8 @@ describe WebMock::RackResponse do
 
     response = @rack_response.evaluate(request)
 
-    response.status.first.should == 200
-    response.body.should include('Hello, Johnny')
+    expect(response.status.first).to eq(200)
+    expect(response.body).to include('Hello, Johnny')
   end
 
   it "should send along POST params" do
@@ -47,7 +47,7 @@ describe WebMock::RackResponse do
     )
 
     response = @rack_response.evaluate(request)
-    response.body.should include('Good to meet you, Jimmy!')
+    expect(response.body).to include('Good to meet you, Jimmy!')
   end
 
   it "should send params with proper content length if params have non-ascii symbols" do
@@ -56,7 +56,7 @@ describe WebMock::RackResponse do
     )
 
     response = @rack_response.evaluate(request)
-    response.body.should include('Good to meet you, Олег!')
+    expect(response.body).to include('Good to meet you, Олег!')
   end
 
   describe 'rack error output' do
@@ -88,15 +88,15 @@ describe WebMock::RackResponse do
     it 'should be failure when wrong credentials' do
       request = WebMock::RequestSignature.new(:get, 'foo:bar@www.example.com')
       response = @rack_response_with_basic_auth.evaluate(request)
-      response.status.first.should == 401
-      response.body.should_not include('This is my root!')
+      expect(response.status.first).to eq(401)
+      expect(response.body).not_to include('This is my root!')
     end
 
     it 'should be success when valid credentials' do
       request = WebMock::RequestSignature.new(:get, 'username:password@www.example.com')
       response = @rack_response_with_basic_auth.evaluate(request)
-      response.status.first.should == 200
-      response.body.should include('This is my root!')
+      expect(response.status.first).to eq(200)
+      expect(response.body).to include('This is my root!')
     end
   end
 end

data/spec/unit/request_execution_verifier_spec.rb

@@ -5,7 +5,7 @@ describe WebMock::RequestExecutionVerifier do
     @verifier = WebMock::RequestExecutionVerifier.new
     @request_pattern = double(WebMock::RequestPattern, :to_s => "www.example.com")
     @verifier.request_pattern = @request_pattern
-    WebMock::RequestRegistry.instance.stub(:to_s).and_return("executed requests")
+    allow(WebMock::RequestRegistry.instance).to receive(:to_s).and_return("executed requests")
     @executed_requests_info = "\n\nThe following requests were made:\n\nexecuted requests\n" + "="*60
   end
 
@@ -17,7 +17,7 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.expected_times_executed = 2
       expected_text = "The request www.example.com was expected to execute 2 times but it executed 0 times"
       expected_text << @executed_requests_info
-      @verifier.failure_message.should == expected_text
+      expect(@verifier.failure_message).to eq(expected_text)
     end
 
     it "should report failure message correctly when executed times is one" do
@@ -25,7 +25,7 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.expected_times_executed = 1
       expected_text = "The request www.example.com was expected to execute 1 time but it executed 1 time"
       expected_text << @executed_requests_info
-      @verifier.failure_message.should == expected_text
+      expect(@verifier.failure_message).to eq(expected_text)
     end
 
     context "at_least_times_executed is set" do
@@ -34,7 +34,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.at_least_times_executed = 2
         expected_text = "The request www.example.com was expected to execute at least 2 times but it executed 1 time"
         expected_text << @executed_requests_info
-        @verifier.failure_message.should == expected_text
+        expect(@verifier.failure_message).to eq(expected_text)
       end
 
       it "reports failure message correctly when executed times is two" do
@@ -42,7 +42,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.at_least_times_executed = 3
         expected_text = "The request www.example.com was expected to execute at least 3 times but it executed 2 times"
         expected_text << @executed_requests_info
-        @verifier.failure_message.should == expected_text
+        expect(@verifier.failure_message).to eq(expected_text)
       end
     end
 
@@ -52,7 +52,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.at_most_times_executed = 2
         expected_text = "The request www.example.com was expected to execute at most 2 times but it executed 3 times"
         expected_text << @executed_requests_info
-        @verifier.failure_message.should == expected_text
+        expect(@verifier.failure_message).to eq(expected_text)
       end
 
       it "reports failure message correctly when executed times is two" do
@@ -60,7 +60,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.at_most_times_executed = 1
         expected_text = "The request www.example.com was expected to execute at most 1 time but it executed 2 times"
         expected_text << @executed_requests_info
-        @verifier.failure_message.should == expected_text
+        expect(@verifier.failure_message).to eq(expected_text)
       end
     end
   end
@@ -72,14 +72,14 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.expected_times_executed = 2
       expected_text = "The request www.example.com was not expected to execute 2 times but it executed 2 times"
       expected_text << @executed_requests_info
-      @verifier.failure_message_when_negated.should == expected_text
+      expect(@verifier.failure_message_when_negated).to eq(expected_text)
     end
 
     it "should report failure message when not expected request but it executed" do
       @verifier.times_executed = 1
       expected_text = "The request www.example.com was expected to execute 0 times but it executed 1 time"
       expected_text << @executed_requests_info
-      @verifier.failure_message_when_negated.should == expected_text
+      expect(@verifier.failure_message_when_negated).to eq(expected_text)
     end
 
     context "at_least_times_executed is set" do
@@ -88,7 +88,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.at_least_times_executed = 2
         expected_text = "The request www.example.com was not expected to execute at least 2 times but it executed 3 times"
         expected_text << @executed_requests_info
-        @verifier.failure_message_when_negated.should == expected_text
+        expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
 
       it "reports failure message correctly when executed times is two" do
@@ -96,7 +96,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.at_least_times_executed = 2
         expected_text = "The request www.example.com was not expected to execute at least 2 times but it executed 2 times"
         expected_text << @executed_requests_info
-        @verifier.failure_message_when_negated.should == expected_text
+        expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
     end
 
@@ -106,7 +106,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.at_most_times_executed = 3
         expected_text = "The request www.example.com was not expected to execute at most 3 times but it executed 2 times"
         expected_text << @executed_requests_info
-        @verifier.failure_message_when_negated.should == expected_text
+        expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
 
       it "reports failure message correctly when executed times is one" do
@@ -114,7 +114,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.at_most_times_executed = 2
         expected_text = "The request www.example.com was not expected to execute at most 2 times but it executed 1 time"
         expected_text << @executed_requests_info
-        @verifier.failure_message_when_negated.should == expected_text
+        expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
     end
 
@@ -123,17 +123,17 @@ describe WebMock::RequestExecutionVerifier do
   describe "matches?" do
 
     it "should succeed if request was executed expected number of times" do
-      WebMock::RequestRegistry.instance.
-        should_receive(:times_executed).with(@request_pattern).and_return(10)
+      expect(WebMock::RequestRegistry.instance).
+        to receive(:times_executed).with(@request_pattern).and_return(10)
       @verifier.expected_times_executed = 10
-      @verifier.matches?.should be_true
+      expect(@verifier.matches?).to be_truthy
     end
 
     it "should fail if request was not executed expected number of times" do
-      WebMock::RequestRegistry.instance.
-        should_receive(:times_executed).with(@request_pattern).and_return(10)
+      expect(WebMock::RequestRegistry.instance).
+        to receive(:times_executed).with(@request_pattern).and_return(10)
       @verifier.expected_times_executed = 5
-      @verifier.matches?.should be_false
+      expect(@verifier.matches?).to be_falsey
     end
 
   end
@@ -141,29 +141,29 @@ describe WebMock::RequestExecutionVerifier do
   describe "does_not_match?" do
 
     it "should fail if request executed expected number of times" do
-      WebMock::RequestRegistry.instance.
-        should_receive(:times_executed).with(@request_pattern).and_return(10)
+      expect(WebMock::RequestRegistry.instance).
+        to receive(:times_executed).with(@request_pattern).and_return(10)
       @verifier.expected_times_executed = 10
-      @verifier.does_not_match?.should be_false
+      expect(@verifier.does_not_match?).to be_falsey
     end
 
     it "should succeed if request was not executed at all and expected number of times was not set" do
-      WebMock::RequestRegistry.instance.
-        should_receive(:times_executed).with(@request_pattern).and_return(0)
-      @verifier.does_not_match?.should be_true
+      expect(WebMock::RequestRegistry.instance).
+        to receive(:times_executed).with(@request_pattern).and_return(0)
+      expect(@verifier.does_not_match?).to be_truthy
     end
 
     it "should fail if request was executed and expected number of times was not set" do
-      WebMock::RequestRegistry.instance.
-        should_receive(:times_executed).with(@request_pattern).and_return(1)
-      @verifier.does_not_match?.should be_false
+      expect(WebMock::RequestRegistry.instance).
+        to receive(:times_executed).with(@request_pattern).and_return(1)
+      expect(@verifier.does_not_match?).to be_falsey
     end
 
     it "should succeed if request was not executed expected number of times" do
-      WebMock::RequestRegistry.instance.
-        should_receive(:times_executed).with(@request_pattern).and_return(10)
+      expect(WebMock::RequestRegistry.instance).
+        to receive(:times_executed).with(@request_pattern).and_return(10)
       @verifier.expected_times_executed = 5
-      @verifier.does_not_match?.should be_true
+      expect(@verifier.does_not_match?).to be_truthy
     end
 
   end