rspec-mocks 2.99.4 → 3.0.0.beta1

data/spec/rspec/mocks/matchers/receive_spec.rb

@@ -9,8 +9,30 @@ module RSpec
         ::RSpec::Mocks.space.verify_all
       end
 
-      def reset_all
-        ::RSpec::Mocks.space.reset_all
+      describe "expectations/allowances on any instance recorders" do
+        include_context "with syntax", [:expect, :should]
+
+        it "warns about allow(Klass.any_instance).to receive..." do
+          expect(RSpec).to receive(:warning).with(/allow.*any_instance.*is probably not what you meant.*allow_any_instance_of.*instead/)
+          allow(Object.any_instance).to receive(:foo)
+        end
+
+        it "includes the correct call site in the allow warning" do
+          expect_warning_with_call_site(__FILE__, __LINE__ + 1)
+          allow(Object.any_instance).to receive(:foo)
+        end
+
+        it "warns about expect(Klass.any_instance).to receive..." do
+          expect(RSpec).to receive(:warning).with(/expect.*any_instance.*is probably not what you meant.*expect_any_instance_of.*instead/)
+          expect(Object.any_instance).to receive(:foo)
+          Object.any_instance.foo
+        end
+
+        it "includes the correct call site in the expect warning" do
+          expect_warning_with_call_site(__FILE__, __LINE__ + 1)
+          expect(Object.any_instance).to receive(:foo)
+          Object.any_instance.foo
+        end
       end
 
       shared_examples_for "a receive matcher" do |*options|
@@ -28,17 +50,6 @@ module RSpec
           }.to raise_error(/received :foo with unexpected arguments/)
         end
 
-        it 'warns about the change to === in RSpec 3 when used with a DateTime' do
-          wrapped.to receive(:foo).with(DateTime.new(2014,1,1,1))
-          allow_deprecation
-          receiver.foo(DateTime.new(2014,1,1,1))
-
-          expect {
-            expect_warn_deprecation_with_call_site __FILE__, __LINE__ + 1
-            receiver.foo(DateTime.new(2014,1,1,2))
-          }.to raise_error(/received :foo with unexpected arguments/)
-        end
-
         it 'allows a `do...end` block implementation to be provided' do
           wrapped.to receive(:foo) do
             4
@@ -85,7 +96,7 @@ module RSpec
       end
 
       shared_examples_for "an expect syntax allowance" do |*options|
-        include_examples "a receive matcher", *options
+        it_behaves_like "a receive matcher", *options
 
         it 'does not expect the message to be received' do
           wrapped.to receive(:foo)
@@ -106,7 +117,7 @@ module RSpec
       end
 
       shared_examples_for "an expect syntax expectation" do |*options|
-        include_examples "a receive matcher", *options
+        it_behaves_like "a receive matcher", *options
 
         it 'sets up a message expectation that passes if the message is received' do
           wrapped.to receive(:foo)
@@ -120,8 +131,6 @@ module RSpec
           expect {
             verify_all
           }.to raise_error(RSpec::Mocks::MockExpectationError)
-
-          reset_all
         end
 
         it "reports the line number of expectation of unreceived message", :pending => options.include?(:does_not_report_line_num) do
@@ -181,61 +190,92 @@ module RSpec
         end
       end
 
+      shared_examples_for "resets partial mocks cleanly" do
+        let(:klass)  { Struct.new(:foo) }
+        let(:object) { klass.new :bar }
+
+        it "removes the method double" do
+          target.to receive(:foo).and_return(:baz)
+          expect { reset object }.to change { object.foo }.from(:baz).to(:bar)
+        end
+      end
+
+      shared_examples_for "resets partial mocks of any instance cleanly" do
+        let(:klass)  { Struct.new(:foo) }
+        let(:object) { klass.new :bar }
+
+        it "removes the method double" do
+          target.to receive(:foo).and_return(:baz)
+          expect {
+            ::RSpec::Mocks.space.verify_all
+          }.to change { object.foo }.from(:baz).to(:bar)
+        end
+      end
+
       describe "allow(...).to receive" do
-        include_examples "an expect syntax allowance" do
+        it_behaves_like "an expect syntax allowance" do
           let(:receiver) { double }
           let(:wrapped)  { allow(receiver) }
         end
+        it_behaves_like "resets partial mocks cleanly" do
+          let(:target) { allow(object) }
+        end
       end
 
       describe "allow(...).not_to receive" do
-        include_examples "an expect syntax negative allowance" do
+        it_behaves_like "an expect syntax negative allowance" do
           let(:wrapped) { allow(double) }
         end
       end
 
       describe "allow_any_instance_of(...).to receive" do
-        before { allow_unavoidable_1_8_deprecation }
-
-        include_examples "an expect syntax allowance" do
+        it_behaves_like "an expect syntax allowance" do
           let(:klass)    { Class.new }
           let(:wrapped)  { allow_any_instance_of(klass) }
           let(:receiver) { klass.new }
         end
+
+        it_behaves_like "resets partial mocks of any instance cleanly" do
+          let(:target) { allow_any_instance_of(klass) }
+        end
       end
 
       describe "allow_any_instance_of(...).not_to receive" do
-        include_examples "an expect syntax negative allowance" do
+        it_behaves_like "an expect syntax negative allowance" do
           let(:wrapped) { allow_any_instance_of(Class.new) }
         end
       end
 
       describe "expect(...).to receive" do
-        include_examples "an expect syntax expectation", :allow_other_matchers do
+        it_behaves_like "an expect syntax expectation", :allow_other_matchers do
           let(:receiver) { double }
           let(:wrapped)  { expect(receiver) }
         end
+        it_behaves_like "resets partial mocks cleanly" do
+          let(:target) { expect(object) }
+        end
       end
 
       describe "expect_any_instance_of(...).to receive" do
-        before { allow_unavoidable_1_8_deprecation }
-
-        include_examples "an expect syntax expectation", :does_not_report_line_num do
+        it_behaves_like "an expect syntax expectation", :does_not_report_line_num do
           let(:klass)    { Class.new }
           let(:wrapped)  { expect_any_instance_of(klass) }
           let(:receiver) { klass.new }
         end
+        it_behaves_like "resets partial mocks of any instance cleanly" do
+          let(:target) { expect_any_instance_of(klass) }
+        end
       end
 
       describe "expect(...).not_to receive" do
-        include_examples "an expect syntax negative expectation" do
+        it_behaves_like "an expect syntax negative expectation" do
           let(:receiver) { double }
           let(:wrapped)  { expect(receiver) }
         end
       end
 
       describe "expect_any_instance_of(...).not_to receive" do
-        include_examples "an expect syntax negative expectation" do
+        it_behaves_like "an expect syntax negative expectation" do
           let(:klass)    { Class.new }
           let(:wrapped)  { expect_any_instance_of(klass) }
           let(:receiver) { klass.new }
@@ -246,7 +286,7 @@ module RSpec
         it 'can use the `expect` syntax' do
           dbl = double
 
-          framework.new.instance_eval do
+          framework.new.instance_exec do
             expect(dbl).to receive(:foo).and_return(3)
           end
 
@@ -256,7 +296,7 @@ module RSpec
         it 'expects the method to be called when `expect` is used' do
           dbl = double
 
-          framework.new.instance_eval do
+          framework.new.instance_exec do
             expect(dbl).to receive(:foo)
           end
 
@@ -266,7 +306,7 @@ module RSpec
         it 'supports `expect(...).not_to receive`' do
           dbl = double
 
-          framework.new.instance_eval do
+          framework.new.instance_exec do
             expect(dbl).not_to receive(:foo)
           end
 
@@ -276,7 +316,7 @@ module RSpec
         it 'supports `expect(...).to_not receive`' do
           dbl = double
 
-          framework.new.instance_eval do
+          framework.new.instance_exec do
             expect(dbl).to_not receive(:foo)
           end
 
@@ -295,14 +335,14 @@ module RSpec
           end
         end
 
-        include_examples "using rspec-mocks in another test framework"
+        it_behaves_like "using rspec-mocks in another test framework"
 
         it 'cannot use `expect` with another matcher' do
           expect {
-            framework.new.instance_eval do
+            framework.new.instance_exec do
               expect(3).to eq(3)
             end
-          }.to raise_error(/only the `receive` matcher is supported/)
+          }.to raise_error(/only the `receive` or `receive_messages` matchers are supported with `expect\(...\).to`/)
         end
 
         it 'can toggle the available syntax' do
@@ -319,7 +359,7 @@ module RSpec
       context "when rspec-expectations is included in the test framework first" do
         before do
           # the examples here assume `expect` is define in RSpec::Matchers...
-          expect(RSpec::Matchers.method_defined?(:expect)).to be true
+          expect(RSpec::Matchers.method_defined?(:expect)).to be_truthy
         end
 
         let(:framework) do
@@ -329,10 +369,10 @@ module RSpec
           end
         end
 
-        include_examples "using rspec-mocks in another test framework"
+        it_behaves_like "using rspec-mocks in another test framework"
 
         it 'can use `expect` with any matcher' do
-          framework.new.instance_eval do
+          framework.new.instance_exec do
             expect(3).to eq(3)
           end
         end
@@ -341,7 +381,7 @@ module RSpec
       context "when rspec-expectations is included in the test framework last" do
         before do
           # the examples here assume `expect` is define in RSpec::Matchers...
-          expect(RSpec::Matchers.method_defined?(:expect)).to be true
+          expect(RSpec::Matchers.method_defined?(:expect)).to be_truthy
         end
 
         let(:framework) do
@@ -351,10 +391,10 @@ module RSpec
           end
         end
 
-        include_examples "using rspec-mocks in another test framework"
+        it_behaves_like "using rspec-mocks in another test framework"
 
         it 'can use `expect` with any matcher' do
-          framework.new.instance_eval do
+          framework.new.instance_exec do
             expect(3).to eq(3)
           end
         end

data/spec/rspec/mocks/methods_spec.rb

@@ -18,7 +18,7 @@ module RSpec
         expect(added_methods).to match_array([
           :as_null_object, :null_object?,
           :received_message?, :should_not_receive, :should_receive,
-          :stub, :stub!, :stub_chain, :unstub, :unstub!
+          :stub, :stub_chain, :unstub
         ])
       end
     end

data/spec/rspec/mocks/{bug_report_830_spec.rb → mock_expectation_error_spec.rb}

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 module RSpec
   module Mocks
-    describe 'Calling a method that catches StandardError' do
+    describe 'MockExpectationError' do
+
       class Foo
         def self.foo
           bar
@@ -10,8 +11,8 @@ module RSpec
         end
       end
 
-      it 'still reports mock failures' do
-        Foo.should_not_receive :bar
+      it 'is not caught by StandardError rescue blocks' do
+        expect(Foo).not_to receive(:bar)
         expect {
           Foo.foo
         }.to raise_error(RSpec::Mocks::MockExpectationError)

data/spec/rspec/mocks/mock_ordering_spec.rb

@@ -16,6 +16,17 @@ module RSpec
         @double.three
       end
 
+      it "passes when messages are received in order" do
+        @double.stub(:something)
+        @double.should_receive(:one).ordered
+        @double.should_receive(:two).ordered
+        @double.should_receive(:three).at_least(:once).ordered
+        @double.one
+        @double.two
+        @double.three
+        @double.three
+      end
+
       it "passes when messages are received in order across objects" do
         a = double("a")
         b = double("b")

data/spec/rspec/mocks/mock_space_spec.rb

@@ -9,7 +9,6 @@ module RSpec
       let(:dbl_2) { Object.new }
 
       before do
-        space.outside_example = false
         space.ensure_registered(dbl_1)
         space.ensure_registered(dbl_2)
       end
@@ -98,6 +97,16 @@ module RSpec
         expect(r1).to be(r2)
         expect(r1).not_to be(r3)
       end
+
+      it 'removes an any_instance_recorder when requested' do
+        klass = Class.new
+
+        space.any_instance_recorder_for(klass)
+
+        expect {
+          space.remove_any_instance_recorder_for(klass)
+        }.to change { space.any_instance_recorders.size }.by(-1)
+      end
     end
   end
 end

data/spec/rspec/mocks/mock_spec.rb

@@ -2,35 +2,16 @@ require 'spec_helper'
 
 module RSpec
   module Mocks
-    describe "::Mock" do
-      before { allow_deprecation }
-
-      it 'returns a reference to Double' do
-        expect(RSpec::Mocks::Mock).to be(RSpec::Mocks::Double)
-      end
-
-      it 'prints a deprecation warning' do
-        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
-        RSpec::Mocks::Mock
-      end
-
-      it 'does not clobber the normal const missing behavior' do
-        expect {
-          RSpec::Mocks::AZBYCX
-        }.to raise_error(NameError, /RSpec::Mocks::AZBYCX/)
-      end
-    end
-
-    describe Double do
+    describe Mock do
       before(:each) { @double = double("test double") }
       after(:each)  { reset @double }
 
       it "has method_missing as private" do
-        expect(RSpec::Mocks::Double.private_instance_methods).to include_method(:method_missing)
+        expect(RSpec::Mocks::Mock.private_instance_methods).to include_method(:method_missing)
       end
 
       it "does not respond_to? method_missing (because it's private)" do
-        expect(RSpec::Mocks::Double.new).not_to respond_to(:method_missing)
+        expect(RSpec::Mocks::Mock.new).not_to respond_to(:method_missing)
       end
 
       it "reports line number of expectation of unreceived message" do
@@ -67,28 +48,18 @@ module RSpec
         }.to raise_error(/trying to negate it again/)
       end
 
-      def expect_and_return_warning
-        expect(RSpec).to receive(:deprecate).with(/`and_return` on a negative message expectation/)
-      end
-
-      it "warns when `should_not_receive().and_return` is used" do
-        expect_and_return_warning
-        @double.should_not_receive(:foo).and_return(1)
-      end
-
-      it "warns when `should_receive().never.and_return` is used" do
-        expect_and_return_warning
-        @double.should_receive(:foo).never.and_return(1)
-      end
+      it "warns when `and_return` is called on a negative expectation" do
+        expect {
+          @double.should_not_receive(:do_something).and_return(1)
+        }.to raise_error(/not supported/)
 
-      it "warns when `expect().not_to receive().and_return` is used" do
-        expect_and_return_warning
-        expect(@double).not_to receive(:foo).and_return(1)
-      end
+        expect {
+          expect(@double).not_to receive(:do_something).and_return(1)
+        }.to raise_error(/not supported/)
 
-      it "warns when `expect().to receive().never.and_return` is used" do
-        expect_and_return_warning
-        expect(@double).to receive(:foo).never.and_return(1)
+        expect {
+          expect(@double).to receive(:do_something).never.and_return(1)
+        }.to raise_error(/not supported/)
       end
 
       it "passes when receiving message specified as not to be received with different args" do
@@ -161,7 +132,6 @@ module RSpec
       end
 
       it "allows block to calculate return values" do
-        allow_deprecation
         @double.should_receive(:something).with("a","b","c").and_return { |a,b,c| c+b+a }
         expect(@double.something("a","b","c")).to eq "cba"
         verify @double
@@ -254,7 +224,7 @@ module RSpec
 
       it "fails if expectation block fails" do
         @double.should_receive(:something) do |bool|
-          expect(bool).to be true
+          expect(bool).to be_truthy
         end
 
         expect {
@@ -287,28 +257,19 @@ module RSpec
         @double.foo { :bar }
       end
 
-      context "with Ruby > 1.8.6", :unless => RUBY_VERSION.to_s == '1.8.6' do
-        it "passes proc to expectation block without an argument" do
-          # We eval this because Ruby 1.8.6's syntax parser barfs on { |&block| ... }
-          # and prevents the entire spec suite from running.
-          eval("@double.should_receive(:foo) {|&block| expect(block.call).to eq(:bar)}")
-          @double.foo { :bar }
-        end
-
-        it "passes proc to expectation block with an argument" do
-          eval("@double.should_receive(:foo) {|arg, &block| expect(block.call).to eq(:bar)}")
-          @double.foo(:arg) { :bar }
-        end
+      it "passes proc to expectation block with an argument" do
+        @double.should_receive(:foo) { |arg, &block| expect(block.call).to eq(:bar) }
+        @double.foo(:arg) { :bar }
+      end
 
-        it "passes proc to stub block without an argurment" do
-          eval("@double.stub(:foo) {|&block| expect(block.call).to eq(:bar)}")
-          @double.foo { :bar }
-        end
+      it "passes proc to stub block without an argurment" do
+        @double.stub(:foo) { |&block| expect(block.call).to eq(:bar) }
+        @double.foo { :bar }
+      end
 
-        it "passes proc to stub block with an argument" do
-          eval("@double.stub(:foo) {|arg, &block| expect(block.call).to eq(:bar)}")
-          @double.foo(:arg) { :bar }
-        end
+      it "passes proc to stub block with an argument" do
+        @double.stub(:foo) { |arg, &block| expect(block.call).to eq(:bar) }
+        @double.foo(:arg) { :bar }
       end
 
       it "fails right away when method defined as never is received" do
@@ -651,7 +612,7 @@ module RSpec
       end
 
       it "assigns stub return values" do
-        double = RSpec::Mocks::Double.new('name', :message => :response)
+        double = RSpec::Mocks::Mock.new('name', :message => :response)
         expect(double.message).to eq :response
       end
 
@@ -709,16 +670,6 @@ module RSpec
         expect(@calls).to eq 10
       end
 
-      it "calls the block after #any_number_of_times" do
-        expect(RSpec).to receive(:deprecate).with("any_number_of_times", :replacement => "stub")
-
-        @double.should_receive(:foo).any_number_of_times { add_call }
-
-        (1..7).each { @double.foo }
-
-        expect(@calls).to eq 7
-      end
-
       it "calls the block after #ordered" do
         @double.should_receive(:foo).ordered { add_call }
         @double.should_receive(:bar).ordered { add_call }
@@ -776,13 +727,6 @@ module RSpec
             @double.should_receive(:foo).with('bar')
             @double.foo('bar')
           end
-
-          it 'includes callsite in deprecation when called without arguments' do
-            obj = Object.new
-            expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /Using `with` without arguments/)
-            obj.stub(:foo).with().and_return('bar')
-            expect(obj.foo).to eq('bar')
-          end
         end
 
         context "with non-matching args" do