#915 - Prevent overwriting teardown

bblimke · Nov 6, 2020 · d2b3658 · d2b3658
1 parent 771647b
commit d2b3658
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/shared_test.rb b/test/shared_test.rb
@@ -9,6 +9,12 @@ def setup
     @stub_https = stub_http_request(:any, "https://www.example.com")
   end
 
+  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
+
   def test_assert_requested_with_stub_and_block_raises_error
     assert_raises ArgumentError do
       assert_requested(@stub_http) {}