rspec-mocks 2.13.1 → 2.14.0.rc1

data/spec/rspec/mocks/methods_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+module RSpec
+  module Mocks
+    describe "Methods added to every object" do
+      include_context "with syntax", :expect
+
+      def added_methods
+        host = Class.new
+        orig_instance_methods = host.instance_methods
+        Syntax.enable_should(host)
+        (host.instance_methods - orig_instance_methods).map(&:to_sym)
+      end
+
+      it 'limits the number of methods that get added to all objects' do
+        # If really necessary, you can add to this list, but long term,
+        # we are hoping to cut down on the number of methods added to all objects
+        expect(added_methods).to match_array([
+          :as_null_object, :null_object?,
+          :received_message?, :should_not_receive, :should_receive,
+          :stub, :stub!, :stub_chain, :unstub, :unstub!
+        ])
+      end
+    end
+  end
+end
+

data/spec/rspec/mocks/mock_ordering_spec.rb

@@ -5,7 +5,7 @@ module RSpec
 
     describe "ordering" do
       before { @double = double("test double") }
-      after  { @double.rspec_reset }
+      after  { reset @double }
 
       it "passes when messages are received in order" do
         @double.should_receive(:one).ordered
@@ -65,8 +65,8 @@ module RSpec
         expect {
           a.three
         }.to raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :three out of order")
-        a.rspec_reset
-        b.rspec_reset
+        reset a
+        reset b
       end
 
       it "ignores order of non ordered messages" do
@@ -86,7 +86,7 @@ module RSpec
         @double.ignored_2
         @double.ordered_3
         @double.ignored_1
-        @double.rspec_verify
+        verify @double
       end
 
       it "supports duplicate messages" do

data/spec/rspec/mocks/mock_space_spec.rb

@@ -4,55 +4,110 @@ require 'rspec/mocks'
 module RSpec
   module Mocks
     describe Space do
-      before :each do
-        @space = RSpec::Mocks::Space.new
-        klazz = Class.new do
-          def rspec_verify
-            @verified = true
-          end
-          def verified?
-            @verified
-          end
-          def rspec_reset
-            @reset = true
-          end
-          def reset?
-            @reset
-          end
-        end
-        @m1 = klazz.new
-        @m2 = klazz.new
+      let(:space) { RSpec::Mocks::Space.new }
+      let(:dbl_1) { Object.new }
+      let(:dbl_2) { Object.new }
+
+      before do
+        space.ensure_registered(dbl_1)
+        space.ensure_registered(dbl_2)
       end
+
       it "verifies all mocks within" do
-        @space.add(@m1)
-        @space.add(@m2)
-        @space.verify_all
-        expect(@m1).to be_verified
-        expect(@m2).to be_verified
+        verifies = []
+
+        space.proxy_for(dbl_1).stub(:verify) { verifies << :dbl_1 }
+        space.proxy_for(dbl_2).stub(:verify) { verifies << :dbl_2 }
+
+        space.verify_all
+
+        expect(verifies).to match_array([:dbl_1, :dbl_2])
       end
+
+      def define_singleton_method_on_recorder_for(klass, name, &block)
+        recorder = space.any_instance_recorder_for(klass)
+        (class << recorder; self; end).send(:define_method, name, &block)
+      end
+
+      it 'verifies all any_instance recorders within' do
+        klass_1, klass_2 = Class.new, Class.new
+
+        verifies = []
+
+        # We can't `stub` a method on the recorder because it defines its own `stub`...
+        define_singleton_method_on_recorder_for(klass_1, :verify) { verifies << :klass_1 }
+        define_singleton_method_on_recorder_for(klass_2, :verify) { verifies << :klass_2 }
+
+        space.verify_all
+
+        expect(verifies).to match_array([:klass_1, :klass_2])
+      end
+
       it "resets all mocks within" do
-        @space.add(m1 = double("mock1"))
-        @space.add(m2 = double("mock2"))
-        m1.should_receive(:rspec_reset)
-        m2.should_receive(:rspec_reset)
-        @space.reset_all
+        resets = []
+
+        space.proxy_for(dbl_1).stub(:reset) { resets << :dbl_1 }
+        space.proxy_for(dbl_2).stub(:reset) { resets << :dbl_2 }
+
+        space.reset_all
+
+        expect(resets).to match_array([:dbl_1, :dbl_2])
       end
-      it "clears internal mocks on reset_all" do
-        @space.add(double("mock"))
-        @space.reset_all
-        expect(@space.instance_eval { receivers.empty? }).to be_true
+
+      it "does not leak mock proxies between examples" do
+        expect {
+          space.reset_all
+        }.to change { space.proxies.size }.to(0)
+      end
+
+      it 'does not leak any instance recorders between examples' do
+        space.any_instance_recorder_for(Class.new)
+        expect {
+          space.reset_all
+        }.to change { space.any_instance_recorders.size }.to(0)
       end
+
       it "resets the ordering" do
-        @space.reset_all
-        expect(@space.expectation_ordering).to be_empty
+        space.expectation_ordering.register :some_expectation
+
+        expect {
+          space.reset_all
+        }.to change { space.expectation_ordering.empty? }.from(false).to(true)
       end
+
       it "only adds an instance once" do
-        @space.add(m1 = double("mock1"))
-        @space.add(m1)
-        m1.should_receive(:rspec_verify)
-        @space.verify_all
+        m1 = double("mock1")
+
+        expect {
+          space.ensure_registered(m1)
+        }.to change { space.proxies }
+
+        expect {
+          space.ensure_registered(m1)
+        }.not_to change { space.proxies }
+      end
+
+      it 'returns a consistent any_instance_recorder for a given class' do
+        klass_1, klass_2 = Class.new, Class.new
+
+        r1 = space.any_instance_recorder_for(klass_1)
+        r2 = space.any_instance_recorder_for(klass_1)
+        r3 = space.any_instance_recorder_for(klass_2)
+
+        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

@@ -4,7 +4,7 @@ module RSpec
   module Mocks
     describe Mock do
       before(:each) { @double = double("test double") }
-      after(:each)  { @double.rspec_reset }
+      after(:each)  { reset @double }
 
       it "has method_missing as private" do
         expect(RSpec::Mocks::Mock.private_instance_methods).to include_method(:method_missing)
@@ -17,7 +17,7 @@ module RSpec
       it "reports line number of expectation of unreceived message" do
         expected_error_line = __LINE__; @double.should_receive(:wont_happen).with("x", 3)
         begin
-          @double.rspec_verify
+          verify @double
           violated
         rescue RSpec::Mocks::MockExpectationError => e
           # NOTE - this regexp ended w/ $, but jruby adds extra info at the end of the line
@@ -29,7 +29,7 @@ module RSpec
         @double.stub(:wont_happen)
         expected_error_line = __LINE__; @double.should_receive(:wont_happen).with("x", 3)
         begin
-          @double.rspec_verify
+          verify @double
           violated
         rescue RSpec::Mocks::MockExpectationError => e
           # NOTE - this regexp ended w/ $, but jruby adds extra info at the end of the line
@@ -39,12 +39,11 @@ module RSpec
 
       it "passes when not receiving message specified as not to be received" do
         @double.should_not_receive(:not_expected)
-        @double.rspec_verify
+        verify @double
       end
 
       it "warns when should_not_receive is followed by and_return" do
-        RSpec::Mocks.should_receive(:warn_deprecation).
-          with(/`and_return` with `should_not_receive` is deprecated/)
+        expect(RSpec).to receive(:deprecate).with("and_return with should_not_receive")
 
         @double.should_not_receive(:do_something).and_return(1)
       end
@@ -53,7 +52,7 @@ module RSpec
         @double.should_not_receive(:message).with("unwanted text")
         @double.should_receive(:message).with("other text")
         @double.message "other text"
-        @double.rspec_verify
+        verify @double
       end
 
       it "fails when receiving message specified as not to be received" do
@@ -63,7 +62,7 @@ module RSpec
           violated
         }.to raise_error(
           RSpec::Mocks::MockExpectationError,
-          %Q|(Double "test double").not_expected(no args)\n    expected: 0 times\n    received: 1 time|
+          %Q|(Double "test double").not_expected(no args)\n    expected: 0 times with any arguments\n    received: 1 time|
         )
       end
 
@@ -74,39 +73,50 @@ module RSpec
           violated
         }.to raise_error(
           RSpec::Mocks::MockExpectationError,
-          %Q|(Double "test double").not_expected("unexpected text")\n    expected: 0 times\n    received: 1 time|
+          %Q|(Double "test double").not_expected("unexpected text")\n    expected: 0 times with arguments: ("unexpected text")\n    received: 1 time with arguments: ("unexpected text")|
+        )
+      end
+
+      it "fails when array arguments do not match" do
+        @double.should_not_receive(:not_expected).with(["do not want"])
+        expect {
+          @double.not_expected(["do not want"])
+          violated
+        }.to raise_error(
+          RSpec::Mocks::MockExpectationError,
+          %Q|(Double "test double").not_expected(["do not want"])\n    expected: 0 times with arguments: (["do not want"])\n    received: 1 time with arguments: (["do not want"])|
         )
       end
 
       it "passes when receiving message specified as not to be received with wrong args" do
         @double.should_not_receive(:not_expected).with("unexpected text")
         @double.not_expected "really unexpected text"
-        @double.rspec_verify
+        verify @double
       end
 
       it "allows block to calculate return values" do
         @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"
-        @double.rspec_verify
+        verify @double
       end
 
       it "allows parameter as return value" do
         @double.should_receive(:something).with("a","b","c").and_return("booh")
         expect(@double.something("a","b","c")).to eq "booh"
-        @double.rspec_verify
+        verify @double
       end
 
       it "returns the previously stubbed value if no return value is set" do
         @double.stub(:something).with("a","b","c").and_return(:stubbed_value)
         @double.should_receive(:something).with("a","b","c")
         expect(@double.something("a","b","c")).to eq :stubbed_value
-        @double.rspec_verify
+        verify @double
       end
 
       it "returns nil if no return value is set and there is no previously stubbed value" do
         @double.should_receive(:something).with("a","b","c")
         expect(@double.something("a","b","c")).to be_nil
-        @double.rspec_verify
+        verify @double
       end
 
       it "raises exception if args don't match when method called" do
@@ -133,7 +143,7 @@ module RSpec
         @double.should_receive(:something).with("a","b","c")
         expect {
           @double.something("a","d","c")
-          @double.rspec_verify
+          verify @double
         }.to raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :something with unexpected arguments\n  expected: (\"a\", \"b\", \"c\")\n       got: (\"a\", \"d\", \"c\")")
       end
 
@@ -142,7 +152,7 @@ module RSpec
         @double.should_receive(:something).with("a","b","c")
         expect {
           @double.something("a","d","c")
-          @double.rspec_verify
+          verify @double
         }.to raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :something with unexpected arguments\n  expected: (\"a\", \"b\", \"c\")\n       got: (\"a\", \"d\", \"c\")")
       end
 
@@ -153,7 +163,7 @@ module RSpec
 
           expect {
             @double.method_with_default_argument(nil)
-            @double.rspec_verify
+            verify @double
           }.to raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :method_with_default_argument with unexpected arguments\n  expected: ({})\n       got: (nil)")
         end
       end
@@ -172,7 +182,7 @@ module RSpec
           "booh"
         end
         expect(@double.something("a", "b")).to eq "booh"
-        @double.rspec_verify
+        verify @double
       end
 
       it "fails if expectation block fails" do
@@ -185,6 +195,10 @@ module RSpec
         }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
       end
 
+      it "is wrappable in an array" do
+        expect( Array(@double) ).to eq([@double])
+      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| ... }
@@ -213,7 +227,7 @@ module RSpec
         @double.should_receive(:not_expected).never
         expect { @double.not_expected }.
           to raise_error(RSpec::Mocks::MockExpectationError,
-                         %Q|(Double "test double").not_expected(no args)\n    expected: 0 times\n    received: 1 time|
+                         %Q|(Double "test double").not_expected(no args)\n    expected: 0 times with any arguments\n    received: 1 time|
         )
       end
 
@@ -282,7 +296,7 @@ module RSpec
         @double.something 1
         @double.something "a", 2
         @double.something [], {}, "joe", 7
-        @double.rspec_verify
+        verify @double
       end
 
       it "fails on no args if any args received" do
@@ -303,7 +317,7 @@ module RSpec
         @double.stub(:method_that_yields).and_yield
         value = @double.method_that_yields { :returned_obj }
         expect(value).to eq :returned_obj
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields 0 args to blocks that take a variable number of arguments" do
@@ -311,7 +325,7 @@ module RSpec
         a = nil
         @double.yield_back {|*x| a = x}
         expect(a).to eq []
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields 0 args multiple times to blocks that take a variable number of arguments" do
@@ -320,7 +334,7 @@ module RSpec
         b = []
         @double.yield_back {|*a| b << a}
         expect(b).to eq [ [], [] ]
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields one arg to blocks that take a variable number of arguments" do
@@ -328,7 +342,7 @@ module RSpec
         a = nil
         @double.yield_back {|*x| a = x}
         expect(a).to eq [99]
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields one arg 3 times consecutively to blocks that take a variable number of arguments" do
@@ -338,7 +352,7 @@ module RSpec
         b = []
         @double.yield_back {|*a| b << a}
         expect(b).to eq [[99], [43], ["something fruity"]]
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields many args to blocks that take a variable number of arguments" do
@@ -346,7 +360,7 @@ module RSpec
         a = nil
         @double.yield_back {|*x| a = x}
         expect(a).to eq [99, 27, "go"]
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields many args 3 times consecutively to blocks that take a variable number of arguments" do
@@ -356,7 +370,7 @@ module RSpec
         b = []
         @double.yield_back {|*a| b << a}
         expect(b).to eq [[99, :green, "go"], ["wait", :amber], ["stop", 12, :red]]
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields single value" do
@@ -364,7 +378,7 @@ module RSpec
         a = nil
         @double.yield_back {|x| a = x}
         expect(a).to eq 99
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields single value 3 times consecutively" do
@@ -374,7 +388,7 @@ module RSpec
         b = []
         @double.yield_back {|a| b << a}
         expect(b).to eq [99, 43, "something fruity"]
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields two values" do
@@ -383,7 +397,7 @@ module RSpec
         @double.yield_back {|x,y| a=x; b=y}
         expect(a).to eq 'wha'
         expect(b).to eq 'zup'
-        @double.rspec_verify
+        verify @double
       end
 
       it "yields two values 3 times consecutively" do
@@ -393,7 +407,7 @@ module RSpec
         c = []
         @double.yield_back {|a,b| c << [a, b]}
         expect(c).to eq [['wha', 'zup'], ['not', 'down'], [14, 65]]
-        @double.rspec_verify
+        verify @double
       end
 
       it "fails when calling yielding method with wrong arity" do
@@ -423,7 +437,7 @@ module RSpec
       it "is able to double send" do
         @double.should_receive(:send).with(any_args)
         @double.send 'hi'
-        @double.rspec_verify
+        verify @double
       end
 
       it "is able to raise from method calling yielding double" do
@@ -435,13 +449,13 @@ module RSpec
           end
         }.to raise_error(StandardError, "Bang")
 
-        @double.rspec_verify
+        verify @double
       end
 
       it "clears expectations after verify" do
         @double.should_receive(:foobar)
         @double.foobar
-        @double.rspec_verify
+        verify @double
         expect {
           @double.foobar
         }.to raise_error(RSpec::Mocks::MockExpectationError, %q|Double "test double" received unexpected message :foobar with (no args)|)
@@ -450,8 +464,8 @@ module RSpec
       it "restores objects to their original state on rspec_reset" do
         double = double("this is a double")
         double.should_receive(:blah)
-        double.rspec_reset
-        double.rspec_verify #should throw if reset didn't work
+        reset double
+        verify double #should throw if reset didn't work
       end
 
       it "works even after method_missing starts raising NameErrors instead of NoMethodErrors" do
@@ -477,9 +491,8 @@ module RSpec
 
         @double.should_receive(:foobar)
         @double.foobar
-        @double.rspec_verify
+        verify @double
 
-        expect { @double.foobar }.to_not raise_error(NameError)
         expect { @double.foobar }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
@@ -489,7 +502,7 @@ module RSpec
         expect(@double.msg(:arg)).to equal(:double_value)
         expect(@double.msg).to equal(:stub_value)
         expect(@double.msg).to equal(:stub_value)
-        @double.rspec_verify
+        verify @double
       end
 
       it "does not require a different signature to replace a method stub" do
@@ -498,7 +511,7 @@ module RSpec
         expect(@double.msg(:arg)).to equal(:double_value)
         expect(@double.msg).to equal(:stub_value)
         expect(@double.msg).to equal(:stub_value)
-        @double.rspec_verify
+        verify @double
       end
 
       it "raises an error when a previously stubbed method has a negative expectation" do
@@ -514,21 +527,21 @@ module RSpec
         expect(non_double.msg(:arg)).to equal(:double_value)
         expect(non_double.msg).to equal(:stub_value)
         expect(non_double.msg).to equal(:stub_value)
-        non_double.rspec_verify
+        verify non_double
       end
 
       it "returns the stubbed value when no new value specified" do
         @double.stub(:msg).and_return(:stub_value)
         @double.should_receive(:msg)
         expect(@double.msg).to equal(:stub_value)
-        @double.rspec_verify
+        verify @double
       end
 
       it "returns the stubbed value when stubbed with args and no new value specified" do
         @double.stub(:msg).with(:arg).and_return(:stub_value)
         @double.should_receive(:msg).with(:arg)
         expect(@double.msg(:arg)).to equal(:stub_value)
-        @double.rspec_verify
+        verify @double
       end
 
       it "does not mess with the stub's yielded values when also doubleed" do
@@ -536,7 +549,7 @@ module RSpec
         @double.should_receive(:yield_back).and_yield(:double_value)
         @double.yield_back{|v| expect(v).to eq :double_value }
         @double.yield_back{|v| expect(v).to eq :stub_value }
-        @double.rspec_verify
+        verify @double
       end
 
       it "can yield multiple times when told to do so" do
@@ -546,7 +559,7 @@ module RSpec
         expect { |b| @double.foo(&b) }.to yield_successive_args(:first_yield, :second_yield)
         expect { |b| @double.foo(&b) }.to yield_with_args(:stub_value)
 
-        @double.rspec_verify
+        verify @double
       end
 
       it "assigns stub return values" do
@@ -609,6 +622,8 @@ module RSpec
       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 }
@@ -681,7 +696,7 @@ module RSpec
             expect do
               @double.foo('baz')
             end.to raise_error
-            @double.rspec_reset
+            reset @double
           end
         end
 
@@ -693,7 +708,7 @@ module RSpec
             expect do
               @double.foo(d2)
             end.to raise_error
-            @double.rspec_reset
+            reset @double
           end
         end
 
@@ -705,7 +720,7 @@ module RSpec
             expect do
               @double.foo(d2)
             end.to raise_error
-            @double.rspec_reset
+            reset @double
           end
         end
       end
@@ -724,11 +739,11 @@ module RSpec
             expect do
               expect(@double.foo('wrong')).to eq('baz')
             end.to raise_error(/received :foo with unexpected arguments/)
-            @double.rspec_reset
+            reset @double
           end
         end
       end
     end
-
   end
 end
+