Play with seperating all proxies from current proxies.

rspec · Mar 30, 2013 · b220495 · b220495
1 parent 37fbb27
commit b220495
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/lib/rspec/mocks/space.rb b/lib/rspec/mocks/space.rb
@@ -6,11 +6,12 @@ class Space
 
       def initialize
         @proxies = {}
+        @current_example_proxies = Set.new
       end
 
       def verify_all
-        proxies.each_value do |object|
-          object.verify
+        @current_example_proxies.each do |proxy|
+          proxy.verify
         end
 
         AnyInstance.verify_all
@@ -20,11 +21,11 @@ def reset_all
         ConstantMutator.reset_all
         AnyInstance.reset_all
 
-        proxies.each_value do |object|
-          object.reset
+        @current_example_proxies.each do |proxy|
+          proxy.reset
         end
 
-        proxies.clear
+        @current_example_proxies.clear
         expectation_ordering.clear
       end
 
@@ -33,13 +34,16 @@ def expectation_ordering
       end
 
       def proxy_for(object)
-        proxies.fetch(object.object_id) do
+        proxy = proxies.fetch(object.object_id) do
           proxies[object.object_id] = if TestDouble === object
                                         object.__build_mock_proxy
                                       else
                                         Proxy.new(object)
                                       end
         end
+
+        @current_example_proxies << proxy
+        proxy
       end
 
       alias ensure_registered proxy_for