Only fulfill any_instance expectations when args match.

lib/rspec/mocks/any_instance/chain.rb

@@ -8,6 +8,7 @@ def initialize(recorder, *args, &block)
           @recorder          = recorder
           @expectation_args  = args
           @expectation_block = block
+          @argument_list_matcher = ArgumentListMatcher::MATCH_ALL
         end
 
         # @private
@@ -63,6 +64,11 @@ def constrained_to_any_of?(*constraints)
           end
         end
 
+        # @private
+        def matches_args?(*args)
+          @argument_list_matcher.args_match?(*args)
+        end
+
         # @private
         def expectation_fulfilled!
           @expectation_fulfilled = true
@@ -73,6 +79,11 @@ def never
           super
         end
 
+        def with(*args, &block)
+          @argument_list_matcher = ArgumentListMatcher.new(*args)
+          super
+        end
+
         private
 
         def negated?

lib/rspec/mocks/any_instance/message_chains.rb

@@ -32,6 +32,15 @@ def has_expectation?(method_name)
           end
         end
 
+        # @private
+        def each_unfulfilled_expectation_matching(method_name, *args)
+          @chains_by_method_name[method_name].each do |chain|
+            if !chain.expectation_fulfilled? && chain.matches_args?(*args)
+              yield chain
+            end
+          end
+        end
+
         # @private
         def all_expectations_fulfilled?
           @chains_by_method_name.all? do |method_name, chains|

lib/rspec/mocks/any_instance/recorder.rb

@@ -123,7 +123,9 @@ def already_observing?(method_name)
 
         # @private
         def notify_received_message(object, message, args, blk)
-          received_expected_message!(message) if message_chains.has_expectation?(message)
+          message_chains.each_unfulfilled_expectation_matching(message, *args) do |expectation|
+            expectation.expectation_fulfilled!
+          end
         end
 
       protected

spec/rspec/mocks/any_instance_spec.rb

@@ -466,6 +466,26 @@ def inspect
           expect(object.foo).to eq(3)
         end
 
+        context "when argument matching is used and an instance has stubbed the message" do
+          it "fails on verify if the arguments do not match" do
+            expect_any_instance_of(klass).to receive(:foo).with(3)
+            instance = klass.new
+            allow(instance).to receive(:foo).and_return(2)
+
+            expect(instance.foo(4)).to eq(2)
+            expect { verify_all }.to fail
+          end
+
+          it "passes on verify if the arguments do match" do
+            expect_any_instance_of(klass).to receive(:foo).with(3)
+            instance = klass.new
+            allow(instance).to receive(:foo).and_return(2)
+
+            expect(instance.foo(3)).to eq(2)
+            expect { verify_all }.not_to raise_error
+          end
+        end
+
         context "with an expectation is set on a method which does not exist" do
           it "returns the expected value" do
             expect_any_instance_of(klass).to receive(:foo).and_return(1)

spec/rspec/mocks/matchers/receive_message_chain_spec.rb

@@ -165,9 +165,6 @@ module RSpec::Mocks::Matchers
 
         expect_any_instance_of(Object).to receive_message_chain(:foo, :bar => 3)
         expect(o.foo.bar).to eq(3)
-
-        # TODO: this shouldn't be necessary to satisfy the expectation, but is.
-        Object.new.foo.bar
       end
 
       it "passes when with expect_any_instance_of is used and the entire chain is called" do