Inline Mockery.reset_instance into Mockery.teardown

Author: floehopper

lib/mocha/hooks.rb

@@ -38,8 +38,6 @@ def mocha_verify(assertion_counter = nil)
     # This method should be called after each individual test has finished (including after any "teardown" code).
     def mocha_teardown
       Mockery.teardown
-    ensure
-      Mockery.reset_instance
     end
   end
 end

lib/mocha/mockery.rb

@@ -55,9 +55,7 @@ def verify(*args)
 
       def teardown
         instance.teardown
-      end
-
-      def reset_instance
+      ensure
         @instances.pop
         @instances = nil if instances.empty?
       end

test/acceptance/prevent_use_of_mocha_outside_test_test.rb

@@ -8,7 +8,7 @@ class PreventUseOfMochaOutsideTestTest < Mocha::TestCase
 
   def setup
     setup_acceptance_test
-    Mocha::Mockery.reset_instance
+    mocha_teardown
   end
 
   def teardown

test/unit/mockery_test.rb

@@ -14,11 +14,11 @@ def setup
   end
 
   def teardown
-    Mockery.reset_instance
+    Mockery.teardown
   end
 
   def test_should_return_null_mockery_if_not_setup
-    Mockery.reset_instance
+    Mockery.teardown
     mockery = Mockery.instance
     assert_not_nil mockery
     assert_kind_of Mockery::Null, mockery
@@ -38,7 +38,7 @@ def test_should_cache_instance_of_mockery
 
   def test_should_expire_mockery_instance_cache
     mockery_1 = Mockery.instance
-    Mockery.reset_instance
+    Mockery.teardown
     mockery_2 = Mockery.instance
     assert_not_same mockery_1, mockery_2
   end

test/unit/object_methods_test.rb

@@ -12,7 +12,7 @@ def setup
   end
 
   def teardown
-    Mocha::Mockery.reset_instance
+    Mocha::Mockery.teardown
   end
 
   def test_should_build_mocha_referring_to_self