fix unstub for regex params

closes #815
excon · Feb 3, 2023 · 3bc5e42 · 3bc5e42
1 parent 462b62e
commit 3bc5e42
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/lib/excon.rb b/lib/excon.rb
@@ -198,8 +198,13 @@ def stub_for(request_params={})
         headers_match = !stub.has_key?(:headers) || stub[:headers].keys.all? do |key|
           case value = stub[:headers][key]
           when Regexp
-            if (match = value.match(request_params[:headers][key]))
-              captures[:headers][key] = match.captures
+            case request_params[:headers][key]
+            when String
+              if (match = value.match(request_params[:headers][key]))
+                captures[:headers][key] = match.captures
+              end
+            when Regexp # for unstub on regex params
+              match = (value == request_params[:headers][key])
             end
             match
           else
@@ -209,8 +214,13 @@ def stub_for(request_params={})
         non_headers_match = (stub.keys - [:headers]).all? do |key|
           case value = stub[key]
           when Regexp
-            if (match = value.match(request_params[key]))
-              captures[key] = match.captures
+            case request_params[key]
+            when String
+              if (match = value.match(request_params[key]))
+                captures[key] = match.captures
+              end
+            when Regexp # for unstub on regex params
+              match = (value == request_params[key])
             end
             match
           else

diff --git a/tests/middlewares/mock_tests.rb b/tests/middlewares/mock_tests.rb
@@ -259,6 +259,20 @@
     Excon.stubs.clear
   end
 
+  tests("unstub({path: %r{/path}})") do
+    connection = nil
+
+    tests("unstub({path: %r{/path}})").returns([{path: %r{/path}, captures: {headers: {}}}, {}]) do
+      connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+      request_params, response_params = { path: %r{/path} }, {}
+      Excon.stub(request_params, response_params)
+
+      Excon.unstub(request_params)
+    end
+
+    Excon.stubs.clear
+  end
+
   tests("global stubs") do
     connection = Excon.new('http://127.0.0.1:9292', :mock => true)
     Excon.stub({}, {:body => '1'})