Pass the instance to any instance stubs.

lib/rspec/mocks/any_instance/expectation_chain.rb

@@ -25,6 +25,11 @@ class PositiveExpectationChain < ExpectationChain
         def create_message_expectation_on(instance)
           proxy = ::RSpec::Mocks.proxy_for(instance)
           expected_from = IGNORED_BACKTRACE_LINE
+          if @expectation_args.last.is_a? Hash
+            @expectation_args.last[:is_any_instance_expectation] = true
+          else
+            @expectation_args << {:is_any_instance_expectation => true}
+          end
           proxy.add_message_expectation(expected_from, *@expectation_args, &@expectation_block)
         end
 

lib/rspec/mocks/any_instance/recorder.rb

@@ -173,6 +173,9 @@ def observe!(method_name)
           @klass.__send__(:define_method, method_name) do |*args, &blk|
             klass = ::RSpec::Mocks.method_handle_for(self, method_name).owner
             ::RSpec::Mocks.any_instance_recorder_for(klass).playback!(self, method_name)
+            if ::RSpec::Mocks.configuration.pass_instance_to_any_instance_stubs
+              args.unshift(self)
+            end
             self.__send__(method_name, *args, &blk)
           end
         end

lib/rspec/mocks/configuration.rb

@@ -23,6 +23,14 @@ def add_stub_and_should_receive_to(*modules)
         end
       end
 
+      def pass_instance_to_any_instance_stubs
+        @pass_instance_to_any_instance_stubs ||= false
+      end
+
+      def pass_instance_to_any_instance_stubs=(arg)
+        @pass_instance_to_any_instance_stubs = arg
+      end
+
       def syntax=(values)
         if Array(values).include?(:expect)
           Syntax.enable_expect

lib/rspec/mocks/message_expectation.rb

@@ -24,6 +24,7 @@ def initialize(error_generator, expectation_ordering, expected_from, method_doub
         @args_to_yield = []
         @failed_fast = nil
         @eval_context = nil
+        @is_any_instance_expectation = opts[:is_any_instance_expectation]
 
         @implementation = Implementation.new
         self.inner_implementation_action = implementation_block
@@ -168,6 +169,10 @@ def and_yield(*args, &block)
 
       # @private
       def matches?(message, *args)
+        args = args.dup
+        if @is_any_instance_expectation && ::RSpec::Mocks.configuration.pass_instance_to_any_instance_stubs
+          args.shift
+        end
         @message == message && @argument_list_matcher.args_match?(*args)
       end
 

spec/rspec/mocks/any_instance_spec.rb

@@ -830,6 +830,71 @@ def foo; end
         end
       end
 
+      context "passing self" do
+        context "when configured to pass the instance" do
+          before(:each) do
+            @orig_pass = RSpec::Mocks.configuration.pass_instance_to_any_instance_stubs
+            RSpec::Mocks.configuration.pass_instance_to_any_instance_stubs = true
+          end
+
+          after(:each) do
+            RSpec::Mocks.configuration.pass_instance_to_any_instance_stubs = @orig_pass
+          end
+
+          describe "an any instance stub" do
+            it "receives the instance" do
+              klass = Struct.new(:science)
+              instance = klass.new
+              klass.any_instance.stub(:bees) { |*args| expect(args.first).to eq(instance) }
+              instance.bees
+            end
+          end
+
+          describe "an any instance expectation" do
+            it "doesn't effect with" do
+              klass = Struct.new(:science)
+              instance = klass.new
+              klass.any_instance.should_receive(:bees).with(:sup)
+              instance.bees(:sup)
+            end
+
+            it "passes the instance" do
+              klass = Struct.new(:science)
+              instance = klass.new
+              klass.any_instance.should_receive(:bees).with(:sup) { |*args| expect(args.first).to eq(instance) }
+              instance.bees(:sup)
+            end
+          end
+        end
+
+        context "when configured not to pass the instance" do
+          before(:each) do
+            @orig_pass = RSpec::Mocks.configuration.pass_instance_to_any_instance_stubs
+            RSpec::Mocks.configuration.pass_instance_to_any_instance_stubs = false
+          end
+
+          after(:each) do
+            RSpec::Mocks.configuration.pass_instance_to_any_instance_stubs = @orig_pass
+          end
+
+          describe "an any instance stub" do
+            it "does not receive the instance" do
+              klass = Struct.new(:science)
+              instance = klass.new
+              klass.any_instance.stub(:bees) { |*args| expect(args).to be_empty }
+              instance.bees
+            end
+
+            it "gets data from with correctly" do
+              klass = Struct.new(:science)
+              instance = klass.new
+              klass.any_instance.should_receive(:bees).with(:faces)
+              instance.bees(:faces)
+            end
+          end
+        end
+      end
+
       context 'when used in conjunction with a `dup`' do
         it "doesn't cause an infinite loop" do
           pending "This intermittently fails on JRuby" if RUBY_PLATFORM == 'java'