Realised why that reset was unnecessary and fixed it

c42engineering · Mar 23, 2011 · 040137b · 040137b
1 parent c2487b8
commit 040137b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/rspec/mocks/any_instance.rb b/lib/rspec/mocks/any_instance.rb
@@ -186,6 +186,12 @@ def any_instance
         __recorder
       end
 
+      def rspec_verify
+        super
+      ensure
+        rspec_reset
+      end
+
       def rspec_reset
         __recorder.stop_observing_currently_observed_methods!
         @__recorder = nil

diff --git a/spec/rspec/mocks/any_instance_spec.rb b/spec/rspec/mocks/any_instance_spec.rb
@@ -156,7 +156,6 @@ class RSpec::SampleRspecTestClass;end
               klass.any_instance.should_receive(:foo)
               klass.new.rspec_verify 
             end.to raise_error(RSpec::Mocks::MockExpectationError)
-            klass.rspec_reset
           end
 
           it "does nothing if no instance is created" do
@@ -176,14 +175,22 @@ class RSpec::SampleRspecTestClass;end
               instance = klass.new
               instance.rspec_verify 
             end.to raise_error(RSpec::Mocks::MockExpectationError)
-            klass.rspec_reset
           end
 
           it "does nothing if no instance is created" do
             klass.any_instance.should_receive(:ooga).and_return(1)
           end
         end
 
+        context "resetting" do
+          it "does not interfere with expectations set on the class" do
+            expect do 
+              klass.should_receive(:woot).and_return(3)
+              klass.rspec_verify
+            end.to raise_error(RSpec::Mocks::MockExpectationError)
+          end
+        end
+
         context "message count" do
           context "the 'once' constraint" do
             it "passes for one invocation" do