webmock 3.9.4 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3a3b9d4cdfb5b9471c673ef6a3cab7e4be5e98d9115a72abf251f0bceed08b9
-  data.tar.gz: d71b867845cc6c805af1af7e5d7b138ecde29310521735692470aabdc5b32c17
+  metadata.gz: 18f78451e2de5c81e96da75d822f7bb1559f4c9f02e80a383758b9c4ef9be1c3
+  data.tar.gz: b245cfea73c1924eaeaad716c487f8548b392d120c28ff0f513da71a63d65944
 SHA512:
-  metadata.gz: 0bea34ef2c38c8896562c31580f08a3043db6ce2e4d61ef73a6eb42b9a1533ab7441f8e4e16d31b34a5ebace2d00b24ffc93bc7cf4fe700d2e5bd95a3d5064fb
-  data.tar.gz: 22658ff730ad2c05fe374e148c1c97f13e64bbe9c02a2b4aba21682a0e7ef23dc477b804e6a1e48fbbe4d717d0d212af4db4e57a3a607d6afae315f2625d5f6e
+  metadata.gz: 494e56d26e2d83828629de2901e0b1e0234a043261e19bd9080d4326e2812fc699cf7ee3817c8b86b3f99603a1a91918bd1d8474bba10fddefd6cf96565a7869
+  data.tar.gz: bb92e415f29748dbb63830bff8231607e599c0082d527513f4c02180dda83930fad830750978be6e59ed206122aeb77f7a48e4603e578fa26aa49f6b143087dd

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+# 3.10.0
+
+  * Added option to global stubs to have lower priority than local stubs.
+
+        WebMock.globally_stub_request(:after_local_stubs) do
+          { body: "global stub body" }
+        end
+
+        stub_request(:get, "www.example.com").to_return(body: 'non-global stub body')
+
+        expect(http_request(:get, "http://www.example.com/").body).to eq("non-global stub body")
+
+    Thanks to [Marek Kasztelnik](https://github.com/mkasztelnik)
+
+# 3.9.5
+
+  * Prevent overwriting `teardown` method in Test::Unit
+
+    Thanks to [Jesse Bowes](https://github.com/jessebs)
+
 # 3.9.4
 
   * More intuitive error message when stubbed response body was provided as Hash

data/README.md

@@ -1149,6 +1149,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Ryan Kerr
 * Adam Harwood
 * Ben Koshy
+* Jesse Bowes
+* Marek Kasztelnik
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/stub_registry.rb

@@ -10,14 +10,18 @@ module WebMock
     end
 
     def global_stubs
-      @global_stubs ||= []
+      @global_stubs ||= Hash.new { |h, k| h[k] = [] }
     end
 
     def reset!
       self.request_stubs = []
     end
 
-    def register_global_stub(&block)
+    def register_global_stub(order = :before_local_stubs, &block)
+      unless %i[before_local_stubs after_local_stubs].include?(order)
+        raise ArgumentError.new("Wrong order. Use :before_local_stubs or :after_local_stubs")
+      end
+
       # This hash contains the responses returned by the block,
       # keyed by the exact request (using the object_id).
       # That way, there's no race condition in case #to_return
@@ -38,7 +42,7 @@ module WebMock
         response_lock.synchronize { responses.delete(request.object_id) }
       })
 
-      global_stubs.push stub
+      global_stubs[order].push stub
     end
 
     def register_request_stub(stub)
@@ -64,9 +68,10 @@ module WebMock
     private
 
     def request_stub_for(request_signature)
-      (global_stubs + request_stubs).detect { |registered_request_stub|
-        registered_request_stub.request_pattern.matches?(request_signature)
-      }
+      (global_stubs[:before_local_stubs] + request_stubs + global_stubs[:after_local_stubs])
+        .detect { |registered_request_stub|
+          registered_request_stub.request_pattern.matches?(request_signature)
+        }
     end
 
     def evaluate_response_for_request(response, request_signature)

data/lib/webmock/test_unit.rb

@@ -8,12 +8,10 @@ module Test
     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

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '3.9.4' unless defined?(::WebMock::VERSION)
+  VERSION = '3.10.0' unless defined?(::WebMock::VERSION)
 end

data/lib/webmock/webmock.rb

@@ -140,8 +140,8 @@ module WebMock
     puts WebMock::RequestExecutionVerifier.executed_requests_message
   end
 
-  def self.globally_stub_request(&block)
-    WebMock::StubRegistry.instance.register_global_stub(&block)
+  def self.globally_stub_request(order = :before_local_stubs, &block)
+    WebMock::StubRegistry.instance.register_global_stub(order, &block)
   end
 
   %w(

data/spec/acceptance/shared/stubbing_requests.rb

@@ -593,6 +593,23 @@ shared_examples_for "stubbing requests" do |*adapter_info|
           end
         end
       end
+
+      context "when global stub should be invoked last" do
+        before do
+          WebMock.globally_stub_request(:after_local_stubs) do
+            { body: "global stub body" }
+          end
+        end
+
+        it "uses global stub when non-global stub is not defined" do
+          expect(http_request(:get, "http://www.example.com/").body).to eq("global stub body")
+        end
+
+        it "uses non-global stub first" do
+          stub_request(:get, "www.example.com").to_return(body: 'non-global stub body')
+          expect(http_request(:get, "http://www.example.com/").body).to eq("non-global stub body")
+        end
+      end
     end
 
     describe "when stubbing request with a block evaluated on request" do

data/test/test_webmock.rb

@@ -3,4 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/shared_test')
 
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.9.4
+  version: 3.10.0
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -407,9 +407,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bblimke/webmock/issues
-  changelog_uri: https://github.com/bblimke/webmock/blob/v3.9.4/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/webmock/3.9.4
-  source_code_uri: https://github.com/bblimke/webmock/tree/v3.9.4
+  changelog_uri: https://github.com/bblimke/webmock/blob/v3.10.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webmock/3.10.0
+  source_code_uri: https://github.com/bblimke/webmock/tree/v3.10.0
   wiki_uri: https://github.com/bblimke/webmock/wiki
 post_install_message:
 rdoc_options: []