lib/webmock/api.rb in webmock-1.20.0 vs lib/webmock/api.rb in webmock-1.20.1

- old
+ new

@@ -63,15 +63,22 @@ request = WebMock::RequestPattern.new(*args).with(&block) [request, args[2] || {}] end def assert_request_requested(request, options = {}) - verifier = WebMock::RequestExecutionVerifier.new(request, options.delete(:times) || 1) + times = options.delete(:times) + at_least_times = options.delete(:at_least_times) + at_most_times = options.delete(:at_most_times) + times = 1 if times.nil? && at_least_times.nil? && at_most_times.nil? + verifier = WebMock::RequestExecutionVerifier.new(request, times, at_least_times, at_most_times) WebMock::AssertionFailure.failure(verifier.failure_message) unless verifier.matches? end def assert_request_not_requested(request, options = {}) - verifier = WebMock::RequestExecutionVerifier.new(request, options.delete(:times)) + times = options.delete(:times) + at_least_times = options.delete(:at_least_times) + at_most_times = options.delete(:at_most_times) + verifier = WebMock::RequestExecutionVerifier.new(request, times, at_least_times, at_most_times) WebMock::AssertionFailure.failure(verifier.failure_message_when_negated) unless verifier.does_not_match? end #this is a based on RSpec::Mocks::ArgumentMatchers#anythingize_lonely_keys def anythingize_lonely_keys(*args)