Merge pull request #919 from jessebs/915-test-unit-teardown

#915 - Prevent overwriting teardown
bblimke · Nov 8, 2020 · a144521 · a144521
2 parents 771647b + ec556cb
commit a144521
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/webmock/test_unit.rb b/lib/webmock/test_unit.rb
@@ -8,12 +8,10 @@ module Unit
     class TestCase
       include WebMock::API
 
-      alias_method :teardown_without_webmock, :teardown
+      teardown
       def teardown_with_webmock
-        teardown_without_webmock
         WebMock.reset!
       end
-      alias_method :teardown, :teardown_with_webmock
 
     end
   end

diff --git a/test/test_webmock.rb b/test/test_webmock.rb
@@ -3,4 +3,10 @@
 
 class TestWebMock < Test::Unit::TestCase
   include SharedTest
+
+  def teardown
+    # Ensure global Test::Unit teardown was called
+    assert_empty WebMock::RequestRegistry.instance.requested_signatures.hash
+    assert_empty WebMock::StubRegistry.instance.request_stubs
+  end
 end