rspec-mocks 2.14.6 → 2.99.0.beta1

data/lib/rspec/mocks/method_double.rb

@@ -147,7 +147,7 @@ module RSpec
             |used instead; however, it may not work correctly when executed due
             |to the fact that `self` will be #{@object.superclass}, not #{@object}.
             |
-            |Called from: #{caller[2]}
+            |Called from: #{CallerFilter.first_non_rspec_line}
           WARNING
 
           @object.superclass.method(@method_name)
@@ -197,7 +197,7 @@ module RSpec
       # @private
       def restore_original_visibility
         return unless object_singleton_class.method_defined?(@method_name) || object_singleton_class.private_method_defined?(@method_name)
-        object_singleton_class.class_eval(@original_visibility, __FILE__, __LINE__)
+        object_singleton_class.class_eval(@original_visibility, __FILE__, __LINE__ + 1)
       end
 
       # @private

data/lib/rspec/mocks/proxy_for_nil.rb

@@ -28,8 +28,8 @@ module RSpec
       private
 
       def warn method_name
-        non_rspec_caller = caller.find { |line| !line.include?('lib/rspec/mocks') }
-        Kernel.warn("An expectation of :#{method_name} was set on nil. Called from #{non_rspec_caller}. Use allow_message_expectations_on_nil to disable warnings.")
+        source = CallerFilter.first_non_rspec_line
+        Kernel.warn("An expectation of :#{method_name} was set on nil. Called from #{source}. Use allow_message_expectations_on_nil to disable warnings.")
       end
 
     end

data/lib/rspec/mocks/space.rb

@@ -27,11 +27,6 @@ module RSpec
         end
 
         proxies.clear
-
-        any_instance_recorders.each_value do |recorder|
-          recorder.stop_all_observation!
-        end
-
         any_instance_recorders.clear
         expectation_ordering.clear
       end
@@ -47,6 +42,10 @@ module RSpec
         end
       end
 
+      def remove_any_instance_recorder_for(klass)
+        any_instance_recorders.delete(klass.__id__)
+      end
+
       def proxies_of(klass)
         proxies.values.select { |proxy| klass === proxy.object }
       end

data/lib/rspec/mocks/stub_chain.rb

@@ -35,7 +35,7 @@ module RSpec
           hash = chain.pop
           hash.each do |k,v|
             chain << k
-            blk = lambda { v }
+            blk = Proc.new { v }
           end
         end
         return chain.join('.').split('.'), blk

data/lib/rspec/mocks/syntax.rb

@@ -15,7 +15,7 @@ module RSpec
         if ::Hash === message_or_hash
           message_or_hash.each {|message, value| stub_object(object, message).and_return value }
         else
-          opts[:expected_from] = caller(1)[1]
+          opts[:expected_from] = CallerFilter.first_non_rspec_line
           ::RSpec::Mocks.allow_message(object, message_or_hash, opts, &block)
         end
       end
@@ -27,12 +27,12 @@ module RSpec
 
         syntax_host.class_eval do
           def should_receive(message, opts={}, &block)
-            opts[:expected_from] ||= caller(1)[0]
+            opts[:expected_from] ||= CallerFilter.first_non_rspec_line
             ::RSpec::Mocks.expect_message(self, message.to_sym, opts, &block)
           end
 
           def should_not_receive(message, &block)
-            opts = {:expected_from => caller(1)[0]}
+            opts = { :expected_from => CallerFilter.first_non_rspec_line }
             ::RSpec::Mocks.expect_message(self, message.to_sym, opts, &block).never
           end
 

data/lib/rspec/mocks/targets.rb

@@ -10,7 +10,7 @@ module RSpec
 
       def self.delegate_to(matcher_method, options = {})
         method_name = options.fetch(:from) { :to }
-        class_eval(<<-RUBY)
+        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
         def #{method_name}(matcher, &block)
           unless Matchers::Receive === matcher
             raise UnsupportedMatcherError, "only the `receive` matcher is supported " +

data/lib/rspec/mocks/test_double.rb

@@ -27,8 +27,9 @@ module RSpec
       # are declared, they'll work as expected. If not, the receiver is
       # returned.
       def as_null_object
-        @__null_object = true
         __mock_proxy.as_null_object
+        @__null_object = true
+        self
       end
 
       # Returns true if this object has received `as_null_object`
@@ -64,7 +65,12 @@ module RSpec
       # @private
       def __build_mock_proxy
         proxy = Proxy.new(self, @name, @options || {})
-        proxy.as_null_object if null_object?
+
+        if null_object?
+          proxy.as_null_object
+          RSpec.deprecate "Relying on a test double's null-ness to persist between examples"
+        end
+
         proxy
       end
 

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.14.6'
+      STRING = '2.99.0.beta1'
     end
   end
 end

data/spec/rspec/mocks/and_yield_spec.rb

@@ -25,7 +25,7 @@ describe RSpec::Mocks::Mock do
         obj.stub(:method_that_accepts_a_block).and_yield do |eval_context|
           evaluated = true
         end
-        expect(evaluated).to be_true
+        expect(evaluated).to be true
       end
 
       it "passes an eval context object to the supplied block" do

data/spec/rspec/mocks/any_instance/message_chains_spec.rb

@@ -4,17 +4,17 @@ describe RSpec::Mocks::AnyInstance::MessageChains do
   let(:recorder) { double }
   let(:chains) { RSpec::Mocks::AnyInstance::MessageChains.new }
   let(:stub_chain) { RSpec::Mocks::AnyInstance::StubChain.new recorder }
-  let(:expectation_chain) { RSpec::Mocks::AnyInstance::PositiveExpectationChain.new recorder }
+  let(:expectation_chain) { RSpec::Mocks::AnyInstance::ExpectationChain.new recorder }
 
   it "knows if a method does not have an expectation set on it" do
     chains.add(:method_name, stub_chain)
-    expect(chains.has_expectation?(:method_name)).to be_false
+    expect(chains.has_expectation?(:method_name)).to be_falsey
   end
 
   it "knows if a method has an expectation set on it" do
     chains.add(:method_name, stub_chain)
     chains.add(:method_name, expectation_chain)
-    expect(chains.has_expectation?(:method_name)).to be_true
+    expect(chains.has_expectation?(:method_name)).to be_truthy
   end
 
   it "can remove all stub chains" do

data/spec/rspec/mocks/any_instance_spec.rb

@@ -332,6 +332,12 @@ module RSpec
             klass.any_instance.unstub(:existing_method)
           }.to raise_error(RSpec::Mocks::MockExpectationError, 'The method `existing_method` was not stubbed or was already unstubbed')
         end
+
+        it 'does not get confused about string vs symbol usage for the message' do
+          klass.any_instance.stub(:existing_method) { :stubbed }
+          klass.any_instance.unstub("existing_method")
+          expect(klass.new.existing_method).to eq(:existing_method_return_value)
+        end
       end
 
       context "with #should_not_receive" do
@@ -369,7 +375,6 @@ module RSpec
             klass.any_instance.should_not_receive(:bar)
             klass.new.foo
             RSpec::Mocks.space.verify_all
-            RSpec::Mocks.space.reset_all
           end
         end
 
@@ -392,36 +397,24 @@ module RSpec
 
           it "fails if an instance is created but no invocation occurs" do
             expect do
-              begin
-                klass.any_instance.should_receive(:foo)
-                klass.new
-                RSpec::Mocks.space.verify_all
-              ensure
-                RSpec::Mocks.space.reset_all
-              end
+              klass.any_instance.should_receive(:foo)
+              klass.new
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
           end
 
           it "fails if no instance is created" do
             expect do
-              begin
-                klass.any_instance.should_receive(:foo).and_return(1)
-                RSpec::Mocks.space.verify_all
-              ensure
-                RSpec::Mocks.space.reset_all
-              end
+              klass.any_instance.should_receive(:foo).and_return(1)
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
           end
 
           it "fails if no instance is created and there are multiple expectations" do
             expect do
-              begin
-                klass.any_instance.should_receive(:foo)
-                klass.any_instance.should_receive(:bar)
-                RSpec::Mocks.space.verify_all
-              ensure
-                RSpec::Mocks.space.reset_all
-              end
+              klass.any_instance.should_receive(:foo)
+              klass.any_instance.should_receive(:bar)
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, 'Exactly one instance should have received the following message(s) but didn\'t: bar, foo')
           end
 
@@ -483,36 +476,24 @@ module RSpec
 
           it "fails if an instance is created but no invocation occurs" do
             expect do
-              begin
-                klass.any_instance.should_receive(:existing_method)
-                klass.new
-                RSpec::Mocks.space.verify_all
-              ensure
-                RSpec::Mocks.space.reset_all
-              end
+              klass.any_instance.should_receive(:existing_method)
+              klass.new
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
           end
 
           it "fails if no instance is created" do
             expect do
-              begin
-                klass.any_instance.should_receive(:existing_method)
-                RSpec::Mocks.space.verify_all
-              ensure
-                RSpec::Mocks.space.reset_all
-              end
+              klass.any_instance.should_receive(:existing_method)
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
           end
 
           it "fails if no instance is created and there are multiple expectations" do
             expect do
-              begin
-                klass.any_instance.should_receive(:existing_method)
-                klass.any_instance.should_receive(:another_existing_method)
-                RSpec::Mocks.space.verify_all
-              ensure
-                RSpec::Mocks.space.reset_all
-              end
+              klass.any_instance.should_receive(:existing_method)
+              klass.any_instance.should_receive(:another_existing_method)
+              RSpec::Mocks.space.verify_all
             end.to raise_error(RSpec::Mocks::MockExpectationError, 'Exactly one instance should have received the following message(s) but didn\'t: another_existing_method, existing_method')
           end
 
@@ -605,24 +586,16 @@ module RSpec
 
             it "fails when no instances are declared" do
               expect do
-                begin
-                  klass.any_instance.should_receive(:foo).once
-                  RSpec::Mocks.space.verify_all
-                ensure
-                  RSpec::Mocks.space.reset_all
-                end
+                klass.any_instance.should_receive(:foo).once
+                RSpec::Mocks.space.verify_all
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
             it "fails when an instance is declared but there are no invocations" do
               expect do
-                begin
-                  klass.any_instance.should_receive(:foo).once
-                  klass.new
-                  RSpec::Mocks.space.verify_all
-                ensure
-                  RSpec::Mocks.space.reset_all
-                end
+                klass.any_instance.should_receive(:foo).once
+                klass.new
+                RSpec::Mocks.space.verify_all
               end.to raise_error(RSpec::Mocks::MockExpectationError, foo_expectation_error_message)
             end
 
@@ -747,13 +720,9 @@ module RSpec
 
               it "fails when the other expecations are not met" do
                 expect do
-                  begin
-                    klass.any_instance.should_receive(:foo).never
-                    klass.any_instance.should_receive(:existing_method).and_return(5)
-                    RSpec::Mocks.space.verify_all
-                  ensure
-                    RSpec::Mocks.space.reset_all
-                  end
+                  klass.any_instance.should_receive(:foo).never
+                  klass.any_instance.should_receive(:existing_method).and_return(5)
+                  RSpec::Mocks.space.verify_all
                 end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
               end
             end
@@ -789,13 +758,9 @@ module RSpec
 
               it "fails when the other expecations are not met" do
                 expect do
-                  begin
-                    klass.any_instance.should_receive(:foo).any_number_of_times
-                    klass.any_instance.should_receive(:existing_method).and_return(5)
-                    RSpec::Mocks.space.verify_all
-                  ensure
-                    RSpec::Mocks.space.reset_all
-                  end
+                  klass.any_instance.should_receive(:foo).any_number_of_times
+                  klass.any_instance.should_receive(:existing_method).and_return(5)
+                  RSpec::Mocks.space.verify_all
                 end.to raise_error(RSpec::Mocks::MockExpectationError, existing_method_expectation_error_message)
               end
             end
@@ -815,14 +780,13 @@ module RSpec
             context "public methods" do
               before(:each) do
                 klass.any_instance.stub(:existing_method).and_return(1)
-                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be_true
+                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be true
               end
 
               it "restores the class to its original state after each example when no instance is created" do
                 space.verify_all
-                space.reset_all
 
-                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be_false
+                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be false
                 expect(klass.new.existing_method).to eq(existing_method_return_value)
               end
 
@@ -830,9 +794,8 @@ module RSpec
                 klass.new.existing_method
 
                 space.verify_all
-                space.reset_all
 
-                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be_false
+                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be false
                 expect(klass.new.existing_method).to eq(existing_method_return_value)
               end
 
@@ -841,9 +804,8 @@ module RSpec
                 klass.new.existing_method
 
                 space.verify_all
-                space.reset_all
 
-                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be_false
+                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be false
                 expect(klass.new.existing_method).to eq(existing_method_return_value)
               end
             end
@@ -852,15 +814,14 @@ module RSpec
               before :each do
                 klass.any_instance.stub(:private_method).and_return(:something)
                 space.verify_all
-                space.reset_all
               end
 
               it "cleans up the backed up method" do
-                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be_false
+                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be false
               end
 
               it "restores a stubbed private method after the spec is run" do
-                expect(klass.private_method_defined?(:private_method)).to be_true
+                expect(klass.private_method_defined?(:private_method)).to be true
               end
 
               it "ensures that the restored method behaves as it originally did" do
@@ -875,15 +836,14 @@ module RSpec
                 klass.any_instance.should_receive(:private_method).and_return(:something)
                 klass.new.private_method
                 space.verify_all
-                space.reset_all
               end
 
               it "cleans up the backed up method" do
-                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be_false
+                expect(klass.method_defined?(:__existing_method_without_any_instance__)).to be false
               end
 
               it "restores a stubbed private method after the spec is run" do
-                expect(klass.private_method_defined?(:private_method)).to be_true
+                expect(klass.private_method_defined?(:private_method)).to be true
               end
 
               it "ensures that the restored method behaves as it originally did" do
@@ -923,7 +883,6 @@ module RSpec
               klass.any_instance.should_receive(:existing_method).and_return(Object.new)
               klass.new.existing_method
               space.verify_all
-              space.reset_all
 
               expect(klass.new.existing_method).to eq(existing_method_return_value)
             end
@@ -936,7 +895,6 @@ module RSpec
             klass.any_instance.stub(:existing_method).and_return(true)
 
             RSpec::Mocks.space.verify_all
-            RSpec::Mocks.space.reset_all
             expect(klass.new).to respond_to(:existing_method)
             expect(klass.new.existing_method).to eq(existing_method_return_value)
           end
@@ -956,6 +914,198 @@ module RSpec
         end
       end
 
+      context "passing the receiver to the implementation block" do
+        context "when configured to pass the instance" do
+          include_context 'with isolated configuration'
+          before(:each) do
+            RSpec::Mocks.configuration.yield_receiver_to_any_instance_implementation_blocks = true
+          end
+
+          describe "an any instance stub" do
+            it "passes the instance as the first arg of the implementation block" do
+              instance = klass.new
+
+              expect { |b|
+                klass.any_instance.should_receive(:bees).with(:sup, &b)
+                instance.bees(:sup)
+              }.to yield_with_args(instance, :sup)
+            end
+
+            it "does not pass the instance to and_call_original" do
+              klass = Class.new do
+                def call(*args)
+                  args.first
+                end
+              end
+              klass.any_instance.should_receive(:call).and_call_original
+              instance = klass.new
+              expect(instance.call(:bees)).to be :bees
+            end
+          end
+
+          describe "an any instance expectation" do
+            it "doesn't effect with" do
+              instance = klass.new
+              klass.any_instance.should_receive(:bees).with(:sup)
+              instance.bees(:sup)
+            end
+
+            it "passes the instance as the first arg of the implementation block" do
+              instance = klass.new
+
+              expect { |b|
+                klass.any_instance.should_receive(:bees).with(:sup, &b)
+                instance.bees(:sup)
+              }.to yield_with_args(instance, :sup)
+            end
+          end
+        end
+
+        context "when configured not to pass the instance" do
+          include_context 'with isolated configuration'
+          before(:each) do
+            RSpec::Mocks.configuration.yield_receiver_to_any_instance_implementation_blocks = false
+          end
+
+          describe "an any instance stub" do
+            it "does not pass the instance to the implementation block" do
+              instance = klass.new
+
+              expect { |b|
+                klass.any_instance.should_receive(:bees).with(:sup, &b)
+                instance.bees(:sup)
+              }.to yield_with_args(:sup)
+            end
+
+            it "does not cause with to fail when the instance is passed" do
+              instance = klass.new
+              klass.any_instance.should_receive(:bees).with(:faces)
+              instance.bees(:faces)
+            end
+          end
+        end
+
+        context "by default" do
+          def block_regex(line)
+            /as the first block argument.*#{__FILE__}:#{line}/m
+          end
+
+          it "is off" do
+            expect(RSpec::Mocks.configuration.yield_receiver_to_any_instance_implementation_blocks?).to be false
+          end
+
+          it "will warn about allowances receiving blocks in 3.0" do
+            klass = Struct.new(:bees)
+
+            expect(RSpec).to receive(:warn_deprecation).with(block_regex(__LINE__ + 1))
+            allow_any_instance_of(klass).to receive(:foo) { |args| }
+            klass.new(:faces).foo
+          end
+
+          it "will warn about expectations receiving blocks in 3.0" do
+            klass = Struct.new(:bees)
+
+            expect(RSpec).to receive(:warn_deprecation).with(block_regex(__LINE__ + 1))
+            expect_any_instance_of(klass).to receive(:foo) { |args| }
+            klass.new(:faces).foo
+          end
+
+          it 'includes the line of the block declaration in the warning, ' +
+             'even when it is different from the `any_instance` line', :unless => (RUBY_VERSION.to_f < 1.9) do
+            klass = Class.new
+            expect(RSpec).to receive(:warn_deprecation).with(block_regex(__LINE__ + 3))
+            stub = klass.any_instance.stub(:foo)
+
+            stub.with("bar") { |args| }
+            klass.new.foo("bar")
+          end
+
+          it "will warn about expectations receiving blocks with a times restriction" do
+            klass = Struct.new(:bees)
+
+            expect(RSpec).to receive(:warn_deprecation).with(block_regex(__LINE__ + 1))
+            klass.any_instance.should_receive(:foo).exactly(3).times { |a| :some_return_value }
+
+            instance = klass.new(:faces)
+            3.times { instance.foo }
+          end
+
+          it "will warn about expectations receiving blocks with an argument expectation" do
+            klass = Struct.new(:bees)
+
+            expect(RSpec).to receive(:warn_deprecation).with(block_regex(__LINE__ + 1))
+            klass.any_instance.should_receive(:foo).with(3) { |b| :some_return_value }
+
+            instance = klass.new(:faces)
+            instance.foo(3)
+          end
+
+          it "works with a do end style block" do
+            klass = Struct.new(:bees)
+
+            expect(RSpec).to receive(:warn_deprecation).with(block_regex(__LINE__ + 1))
+            klass.any_instance.should_receive(:foo).with(3) do |a|
+              :some_return_value
+            end
+
+            instance = klass.new(:faces)
+            instance.foo(3)
+          end
+
+          it "won't warn if there is no implementation block on an expectation" do
+            expect(RSpec).not_to receive(:warn_deprecation)
+
+            klass = Struct.new(:bees)
+
+            allow_any_instance_of(klass).to receive(:foo)
+            klass.new(:faces).foo
+          end
+
+          it "won't warn if the implementation block ignores arguments", :if => (RUBY_VERSION.to_f > 1.8) do
+            expect(RSpec).not_to receive(:warn_deprecation)
+
+            klass = Struct.new(:bees)
+            allow_any_instance_of(klass).to receive(:foo) { 5 }
+            klass.new(:faces).foo
+          end
+
+          it "warns if the implementation block accepts a splat" do
+            klass = Struct.new(:bees)
+
+            expect(RSpec).to receive(:warn_deprecation).with(block_regex(__LINE__ + 1))
+            allow_any_instance_of(klass).to receive(:foo) { |*a| 5 }
+
+            klass.new(:faces).foo
+          end
+
+          it "warns if it the implementation is a lambda that expects no arguments" do
+            klass = Struct.new(:bees)
+
+            expect(RSpec).to receive(:warn_deprecation).with(block_regex(__LINE__ + 1))
+            allow_any_instance_of(klass).to receive(:foo, &lambda { 5 })
+
+            klass.new(:faces).foo
+          end
+
+          it "will warn about stubs receiving blocks in 3.0" do
+            klass = Struct.new(:bees)
+
+            expect(RSpec).to receive(:warn_deprecation).with(block_regex(__LINE__ + 1))
+            expect_any_instance_of(klass).to receive(:foo) { |args| }
+            klass.new(:faces).foo
+          end
+
+          it "won't warn if there is no implementation block on an stub" do
+            expect(RSpec).not_to receive(:warn_deprecation)
+
+            klass = Struct.new(:bees)
+
+            allow_any_instance_of(klass).to receive(:foo)
+            klass.new(:faces).foo
+          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'
@@ -1026,7 +1176,6 @@ module RSpec
           expect(instance.existing_method).to eq :stubbed_return_value
 
           RSpec::Mocks.verify
-          RSpec::Mocks.teardown
 
           expect(instance.existing_method).to eq :existing_method_return_value
         end