webmock 1.19.0 → 1.20.0

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.20.0
+
+  * Add support for on_missing callback of Curb::Easy
+
+      Thanks to [Tasos Stathopoulos](https://github.com/astathopoulos)
+
+  * Add at_least_times and at_most_times matchers
+
+      Thanks to [Dan Buettner](https://github.com/Capncavedan)
+
 ## 1.19.0
 
   * Fixed issue with Excon adapter giving warning message when redirects middleware was enabled.

data/README.md

@@ -563,6 +563,14 @@ a_request(:post, "www.example.com").
 
 a_request(:post, "www.something.com").should have_been_made.times(3)
 
+a_request(:post, "www.something.com").should have_been_made.at_least_once
+
+a_request(:post, "www.something.com").should have_been_made.at_least_times(3)
+
+a_request(:post, "www.something.com").should have_been_made.at_most_twice
+
+a_request(:post, "www.something.com").should have_been_made.at_most_times(3)
+
 a_request(:any, "www.example.com").should_not have_been_made
 
 a_request(:post, "www.example.com").with { |req| req.body == "abc" }.should have_been_made
@@ -920,6 +928,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Thorbjørn Hermanse
 * Mark Lorenz
 * tjsousa
+* Tasos Stathopoulos
+* Dan Buettner
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -159,7 +159,9 @@ if defined?(Curl)
         case response_code
         when 200..299
           @on_success.call(self) if @on_success
-        when 400..599
+        when 400..499
+          @on_missing.call(self, self.response_code) if @on_missing
+        when 500..599
           @on_failure.call(self, self.response_code) if @on_failure
         end
       end
@@ -257,7 +259,7 @@ if defined?(Curl)
         @content_type || super
       end
 
-      %w[ success failure header body complete progress ].each do |callback|
+      %w[ success failure missing header body complete progress ].each do |callback|
         class_eval <<-METHOD, __FILE__, __LINE__
           def on_#{callback} &block
             @on_#{callback} = block

data/lib/webmock/request_execution_verifier.rb

@@ -1,17 +1,26 @@
 module WebMock
   class RequestExecutionVerifier
 
-    attr_accessor :request_pattern, :expected_times_executed, :times_executed
+    attr_accessor :request_pattern, :expected_times_executed, :times_executed, :at_least_times_executed, :at_most_times_executed
 
-    def initialize(request_pattern = nil, expected_times_executed = nil)
+    def initialize(request_pattern = nil, expected_times_executed = nil, at_least_times_executed = nil, at_most_times_executed = nil)
       @request_pattern = request_pattern
       @expected_times_executed = expected_times_executed
+      @at_least_times_executed = at_least_times_executed
+      @at_most_times_executed = at_most_times_executed
     end
 
     def matches?
       @times_executed =
-      RequestRegistry.instance.times_executed(@request_pattern)
-      @times_executed == (@expected_times_executed || 1)
+        RequestRegistry.instance.times_executed(@request_pattern)
+
+      if @at_least_times_executed
+        @times_executed >= @at_least_times_executed
+      elsif @at_most_times_executed
+        @times_executed <= @at_most_times_executed
+      else
+        @times_executed == (@expected_times_executed || 1)
+      end
     end
 
     def does_not_match?
@@ -27,13 +36,23 @@ module WebMock
 
     def failure_message
       expected_times_executed = @expected_times_executed || 1
-      text = %Q(The request #{request_pattern.to_s} was expected to execute #{times(expected_times_executed)} but it executed #{times(times_executed)})
+      text = if @at_least_times_executed
+        %Q(The request #{request_pattern.to_s} was expected to execute at least #{times(@at_least_times_executed)} but it executed #{times(times_executed)})
+      elsif @at_most_times_executed
+        %Q(The request #{request_pattern.to_s} was expected to execute at most #{times(@at_most_times_executed)} but it executed #{times(times_executed)})
+      else
+        %Q(The request #{request_pattern.to_s} was expected to execute #{times(expected_times_executed)} but it executed #{times(times_executed)})
+      end
       text << self.class.executed_requests_message
       text
     end
 
     def failure_message_when_negated
-      text = if @expected_times_executed
+      text = if @at_least_times_executed
+        %Q(The request #{request_pattern.to_s} was not expected to execute at least #{times(@at_least_times_executed)} but it executed #{times(times_executed)})
+      elsif @at_most_times_executed
+        %Q(The request #{request_pattern.to_s} was not expected to execute at most #{times(@at_most_times_executed)} but it executed #{times(times_executed)})
+      elsif @expected_times_executed
         %Q(The request #{request_pattern.to_s} was not expected to execute #{times(expected_times_executed)} but it executed #{times(times_executed)})
       else
         %Q(The request #{request_pattern.to_s} was expected to execute 0 times but it executed #{times(times_executed)})

data/lib/webmock/rspec/matchers/request_pattern_matcher.rb

@@ -20,6 +20,36 @@ module WebMock
       self
     end
 
+    def at_least_once
+      @request_execution_verifier.at_least_times_executed = 1
+      self
+    end
+
+    def at_least_twice
+      @request_execution_verifier.at_least_times_executed = 2
+      self
+    end
+
+    def at_least_times(times)
+      @request_execution_verifier.at_least_times_executed = times.to_i
+      self
+    end
+
+    def at_most_once
+      @request_execution_verifier.at_most_times_executed = 1
+      self
+    end
+
+    def at_most_twice
+      @request_execution_verifier.at_most_times_executed = 2
+      self
+    end
+
+    def at_most_times(times)
+      @request_execution_verifier.at_most_times_executed = times.to_i
+      self
+    end
+
     def matches?(request_pattern)
       @request_execution_verifier.request_pattern = request_pattern
       @request_execution_verifier.matches?

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.19.0' unless defined?(::WebMock::VERSION)
+  VERSION = '1.20.0' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/curb/curb_spec.rb

@@ -42,13 +42,13 @@ unless RUBY_PLATFORM =~ /java/
         test.should == body
       end
 
-      it "should call on_failure with 4xx response" do
+      it "should call on_missing with 4xx response" do
         response_code = 403
         stub_request(:any, "example.com").
           to_return(:status => [response_code, "None shall pass"])
 
         test = nil
-        @curl.on_failure do |c, code|
+        @curl.on_missing do |c, code|
           test = code
         end
         @curl.http_get
@@ -139,6 +139,7 @@ unless RUBY_PLATFORM =~ /java/
         stub_request(:any, "example.com")
         order = []
         @curl.on_success {|*args| order << :on_success }
+        @curl.on_missing {|*args| order << :on_missing }
         @curl.on_failure {|*args| order << :on_failure }
         @curl.on_header {|*args| order << :on_header }
         @curl.on_body {|*args| order << :on_body }
@@ -153,6 +154,7 @@ unless RUBY_PLATFORM =~ /java/
         stub_request(:any, "example.com").to_return(:status => [500, ""])
         order = []
         @curl.on_success {|*args| order << :on_success }
+        @curl.on_missing {|*args| order << :on_missing }
         @curl.on_failure {|*args| order << :on_failure }
         @curl.on_header {|*args| order << :on_header }
         @curl.on_body {|*args| order << :on_body }
@@ -162,6 +164,21 @@ unless RUBY_PLATFORM =~ /java/
 
         order.should == [:on_progress,:on_header,:on_body,:on_complete,:on_failure]
       end
+
+      it "should call callbacks in correct order on missing request" do
+        stub_request(:any, "example.com").to_return(:status => [403, ""])
+        order = []
+        @curl.on_success {|*args| order << :on_success }
+        @curl.on_missing {|*args| order << :on_missing }
+        @curl.on_failure {|*args| order << :on_failure }
+        @curl.on_header {|*args| order << :on_header }
+        @curl.on_body {|*args| order << :on_body }
+        @curl.on_complete {|*args| order << :on_complete }
+        @curl.on_progress {|*args| order << :on_progress }
+        @curl.http_get
+
+        order.should == [:on_progress,:on_header,:on_body,:on_complete,:on_missing]
+      end
     end
 
     describe '#last_effective_url' do

data/spec/acceptance/excon/excon_spec.rb

@@ -22,7 +22,7 @@ describe "Excon" do
       WebMock.allow_net_connect!
       r = Excon.new('http://httpstat.us/200').get(:response_block => lambda {|e, remaining, total| a << e}, :chunk_size => 1)
       a.should == ["2", "0", "0", " ", "O", "K"]
-      r.body.should == "200 OK" #this should be "", but there is an issue in Excon https://github.com/excon/excon/issues/429
+      r.body.should == ""
     end
 
     it "should support excon response_block" do
@@ -30,7 +30,7 @@ describe "Excon" do
       stub_request(:get, "http://example.com/").to_return(:body => "abc")
       r = Excon.new('http://example.com').get(:response_block => lambda {|e, remaining, total| a << e}, :chunk_size => 1)
       a.should == ['a', 'b', 'c']
-      r.body.should == "abc" #this should be "", but there is an issue in Excon https://github.com/excon/excon/issues/429
+      r.body.should == ""
     end
 
     it "should invoke callbacks with response body even if a real request is made", :net_connect => true do
@@ -43,7 +43,7 @@ describe "Excon" do
       r = Excon.new('http://httpstat.us/200').get(:response_block => lambda {|e, remaining, total| a << e}, :chunk_size => 1)
       response.body.should == "200 OK"
       a.should == ["2", "0", "0", " ", "O", "K"]
-      r.body.should == "200 OK" #this should be "", but there is an issue in Excon https://github.com/excon/excon/issues/429
+      r.body.should == ""
     end
   end
 

data/spec/acceptance/shared/request_expectations.rb

@@ -177,6 +177,181 @@ shared_context "request expectations" do |*adapter_info|
         end
       end
 
+
+
+      describe "at_most_times" do
+        it "fails if request was made more times than maximum" do
+          lambda {
+            http_request(:get, "http://www.example.com/")
+            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.at_most_times(2)
+          }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute at most 2 times but it executed 3 times))
+        end
+
+        it "passes if request was made the maximum number of times" do
+          lambda {
+            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.at_most_times(2)
+          }.should_not raise_error
+        end
+
+        it "passes if request was made fewer than the maximum number of times" do
+          lambda {
+            http_request(:get, "http://www.example.com/")
+            a_request(:get, "http://www.example.com").should have_been_made.at_most_times(2)
+          }.should_not raise_error
+        end
+
+        it "passes if request was not made at all" do
+          lambda {
+            a_request(:get, "http://www.example.com").should have_been_made.at_most_times(2)
+          }.should_not raise_error
+        end
+      end
+
+
+      describe "at_least_times" do
+        it "fails if request was made fewer times than minimum" do
+          lambda {
+            http_request(:get, "http://www.example.com/")
+            a_request(:get, "http://www.example.com").should have_been_made.at_least_times(2)
+          }.should fail_with(%r(The request GET http://www.example.com/ was expected to execute at least 2 times but it executed 1 time))
+        end
+
+        it "passes if request was made the minimum number of times" do
+          lambda {
+            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.at_least_times(2)
+          }.should_not raise_error
+        end
+
+        it "passes if request was made more than the minimum number of times" do
+          lambda {
+            http_request(:get, "http://www.example.com/")
+            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.at_least_times(2)
+          }.should_not raise_error
+        end
+
+        context "descriptive at_most_ matcher" do
+          context "at_most_once" do
+            it "succeeds if no request was executed" do
+              lambda {
+                a_request(:get, "http://www.example.com").should have_been_made.at_most_once
+              }.should_not raise_error
+            end
+
+            it "satisfies expectation if request was executed with the same uri and method once" do
+              lambda {
+                http_request(:get, "http://www.example.com/")
+                a_request(:get, "http://www.example.com").should have_been_made.at_most_once
+              }.should_not raise_error
+            end
+
+            it "fails if request was executed with the same uri and method twice" do
+              lambda {
+                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.at_most_once
+              }.should raise_error
+            end
+          end
+
+          context "at_most_twice" do
+            it "succeeds if no request was executed" do
+              lambda {
+                a_request(:get, "http://www.example.com").should have_been_made.at_most_twice
+              }.should_not raise_error
+            end
+
+            it "succeeds if too few requests were executed" do
+              lambda {
+                http_request(:get, "http://www.example.com/")
+                a_request(:get, "http://www.example.com").should have_been_made.at_most_twice
+              }.should_not raise_error
+            end
+
+            it "satisfies expectation if request was executed with the same uri and method twice" do
+              lambda {
+                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.at_most_twice
+              }.should_not raise_error
+            end
+
+            it "fails if request was executed with the same uri and method three times" do
+              lambda {
+                http_request(:get, "http://www.example.com/")
+                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.at_most_twice
+              }.should raise_error
+            end
+          end
+        end
+
+        context "descriptive at_least_ matcher" do
+          context "at_least_once" do
+            it "fails if no request was executed" do
+              lambda {
+                a_request(:get, "http://www.example.com").should have_been_made.at_least_once
+              }.should raise_error
+            end
+
+            it "satisfies expectation if request was executed with the same uri and method once" do
+              lambda {
+                http_request(:get, "http://www.example.com/")
+                a_request(:get, "http://www.example.com").should have_been_made.at_least_once
+              }.should_not raise_error
+            end
+
+            it "satisfies expectation if request was executed with the same uri and method twice" do
+              lambda {
+                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.at_least_once
+              }.should_not raise_error
+            end
+          end
+
+          context "at_least_twice" do
+            it "fails if no request was executed" do
+              lambda {
+                a_request(:get, "http://www.example.com").should have_been_made.at_least_twice
+              }.should raise_error
+            end
+
+            it "fails if too few requests were executed" do
+              lambda {
+                http_request(:get, "http://www.example.com/")
+                a_request(:get, "http://www.example.com").should have_been_made.at_least_twice
+              }.should raise_error
+            end
+
+            it "satisfies expectation if request was executed with the same uri and method twice" do
+              lambda {
+                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.at_least_twice
+              }.should_not raise_error
+            end
+
+            it "satisfies expectation if request was executed with the same uri and method three times" do
+              lambda {
+                http_request(:get, "http://www.example.com/")
+                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.at_least_twice
+              }.should_not raise_error
+            end
+          end
+        end
+      end
+
       it "should fail if request was made more times than expected" do
         lambda {
           http_request(:get, "http://www.example.com/")

data/spec/unit/request_execution_verifier_spec.rb

@@ -28,6 +28,41 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.failure_message.should == expected_text
     end
 
+    context "at_least_times_executed is set" do
+      it "reports failure message correctly when executed times is one" do
+        @verifier.times_executed = 1
+        @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
+      end
+
+      it "reports failure message correctly when executed times is two" do
+        @verifier.times_executed = 2
+        @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
+      end
+    end
+
+    context "at_most_times_executed is set" do
+      it "reports failure message correctly when executed times is three" do
+        @verifier.times_executed = 3
+        @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
+      end
+
+      it "reports failure message correctly when executed times is two" do
+        @verifier.times_executed = 2
+        @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
+      end
+    end
   end
 
   describe "negative failure message" do
@@ -47,6 +82,42 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.failure_message_when_negated.should == expected_text
     end
 
+    context "at_least_times_executed is set" do
+      it "reports failure message correctly when executed times is one" do
+        @verifier.times_executed = 3
+        @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
+      end
+
+      it "reports failure message correctly when executed times is two" do
+        @verifier.times_executed = 2
+        @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
+      end
+    end
+
+    context "at_most_times_executed is set" do
+      it "reports failure message correctly when executed times is three" do
+        @verifier.times_executed = 2
+        @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
+      end
+
+      it "reports failure message correctly when executed times is one" do
+        @verifier.times_executed = 1
+        @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
+      end
+    end
+
   end
 
   describe "matches?" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 71
   prerelease: 
   segments: 
   - 1
-  - 19
+  - 20
   - 0
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-09-28 00:00:00 +02:00
+date: 2014-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency