From 17c259ea5143d309e90ca6d53d40f6356ac2d0a5 Mon Sep 17 00:00:00 2001 From: David Chelimsky Date: Wed, 8 Feb 2012 07:33:02 -0600 Subject: [PATCH] some mocks are not mocks --- lib/rspec/mocks/space.rb | 13 ++++++------- spec/rspec/mocks/any_instance_spec.rb | 4 ++-- spec/rspec/mocks/mock_space_spec.rb | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/rspec/mocks/space.rb b/lib/rspec/mocks/space.rb index 096bd5ea5..dee1662e1 100644 --- a/lib/rspec/mocks/space.rb +++ b/lib/rspec/mocks/space.rb @@ -3,20 +3,20 @@ module Mocks # @api private class Space def add(obj) - mocks << obj unless mocks.detect {|m| m.equal? obj} + receivers << obj unless receivers.detect {|m| m.equal? obj} end def verify_all - mocks.each do |mock| + receivers.each do |mock| mock.rspec_verify end end def reset_all - mocks.each do |mock| + receivers.each do |mock| mock.rspec_reset end - mocks.clear + receivers.clear expectation_ordering.clear end @@ -26,10 +26,9 @@ def expectation_ordering private - def mocks - @mocks ||= [] + def receivers + @receivers ||= [] end - end end end diff --git a/spec/rspec/mocks/any_instance_spec.rb b/spec/rspec/mocks/any_instance_spec.rb index e5613498f..aa2c653c0 100644 --- a/spec/rspec/mocks/any_instance_spec.rb +++ b/spec/rspec/mocks/any_instance_spec.rb @@ -769,14 +769,14 @@ class RSpec::SampleRspecTestClass;end it "adds an class to the current space when #any_instance is invoked" do klass.any_instance - RSpec::Mocks::space.send(:mocks).should include(klass) + RSpec::Mocks::space.send(:receivers).should include(klass) end it "adds an instance to the current space when stubbed method is invoked" do klass.any_instance.stub(:foo) instance = klass.new instance.foo - RSpec::Mocks::space.send(:mocks).should include(instance) + RSpec::Mocks::space.send(:receivers).should include(instance) end end diff --git a/spec/rspec/mocks/mock_space_spec.rb b/spec/rspec/mocks/mock_space_spec.rb index ec0c37b9d..750808f9f 100644 --- a/spec/rspec/mocks/mock_space_spec.rb +++ b/spec/rspec/mocks/mock_space_spec.rb @@ -40,7 +40,7 @@ def reset? it "clears internal mocks on reset_all" do @space.add(double("mock")) @space.reset_all - @space.instance_eval { mocks.empty? }.should be_true + @space.instance_eval { receivers.empty? }.should be_true end it "resets the ordering" do @space.reset_all