lib/webmock/api.rb in webmock-1.9.3 vs lib/webmock/api.rb in webmock-1.10.0

@@ -19,28 +19,36 @@
 
 
     def assert_requested(*args, &block)
       if not args[0].is_a?(WebMock::RequestStub)
         args = convert_uri_method_and_options_to_request_and_options(*args, &block)
+      elsif block
+        raise ArgumentError, "assert_requested with a stub object, doesn't accept blocks"
       end
-      assert_request_requested(*args, &block)
+      assert_request_requested(*args)
     end
 
     def assert_not_requested(*args, &block)
       if not args[0].is_a?(WebMock::RequestStub)
         args = convert_uri_method_and_options_to_request_and_options(*args, &block)
+      elsif block
+        raise ArgumentError, "assert_not_requested with a stub object, doesn't accept blocks"
       end
-      assert_request_not_requested(*args, &block)
+      assert_request_not_requested(*args)
     end
 
     def hash_including(expected)
       if defined?(::RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)
         RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher.new(expected)
       elsif defined?(::Spec::Mocks::ArgumentMatchers::HashIncludingMatcher)
         Spec::Mocks::ArgumentMatchers::HashIncludingMatcher.new(expected)
       else
         WebMock::Matchers::HashIncludingMatcher.new(expected)
       end
+    end
+
+    def remove_request_stub(stub)
+      WebMock::StubRegistry.instance.remove_request_stub(stub)
     end
 
     private
 
     def convert_uri_method_and_options_to_request_and_options(*args, &block)