Merge fed03c9 into 19d39b7

rspec · Jul 12, 2013 · e0413ea · e0413ea
2 parents 19d39b7 + fed03c9
commit e0413ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/rspec/mocks/example_methods.rb b/lib/rspec/mocks/example_methods.rb
@@ -114,6 +114,7 @@ def hide_const(constant_name)
       #   # You can also use most message expectations:
       #   expect(invitation).to have_received(:accept).with(mailer).once
       def have_received(method_name)
+        raise "have_received matcher does not take a block argument: #{caller[0]}" if block_given?
         Matchers::HaveReceived.new(method_name)
       end
 

diff --git a/spec/rspec/mocks/matchers/have_received_spec.rb b/spec/rspec/mocks/matchers/have_received_spec.rb
@@ -60,6 +60,14 @@ module Mocks
           }.to raise_error(/0 times/)
         end
 
+        it "raises an exception when a block is used to match the arguments" do
+          dbl = double_with_met_expectation(:expected_method)
+          expect {
+            expect(dbl).to have_received(:expected_method) { |argument|
+            }
+          }.to raise_error(/have_received matcher does not take a block argument/)
+        end
+
         context "with" do
           it 'passes when the given args match the args used with the message' do
             dbl = double_with_met_expectation(:expected_method, :expected, :args)