Version 3.10.0

bblimke · Nov 12, 2020 · f61d51a · f61d51a
1 parent bacb8a5
commit f61d51a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # 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

diff --git a/README.md b/README.md
@@ -1150,6 +1150,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * 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.

diff --git a/lib/webmock/version.rb b/lib/webmock/version.rb
@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '3.9.5' unless defined?(::WebMock::VERSION)
+  VERSION = '3.10.0' unless defined?(::WebMock::VERSION)
 end