Make HTTP.rb adapter work with new versions

Versions of HTTP.rb that allow access to the Request from the Response (httprb/http#546) require this change to continue working.
ShippingEasy · Oct 5, 2019 · 2eace84 · 2eace84
1 parent e9544e8
commit 2eace84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/webmock/http_lib_adapters/http_rb/response.rb b/lib/webmock/http_lib_adapters/http_rb/response.rb
@@ -11,7 +11,7 @@ def to_webmock
     end
 
     class << self
-      def from_webmock(webmock_response, request_signature = nil)
+      def from_webmock(webmock_response, request, request_signature = nil)
         status  = Status.new(webmock_response.status.first)
         headers = webmock_response.headers || {}
         body    = Body.new Streamer.new webmock_response.body
@@ -24,7 +24,8 @@ def from_webmock(webmock_response, request_signature = nil)
           version: "1.1",
           headers: headers,
           body: body,
-          uri: uri
+          uri: uri,
+          request: request
         })
       end
 

diff --git a/lib/webmock/http_lib_adapters/http_rb/webmock.rb b/lib/webmock/http_lib_adapters/http_rb/webmock.rb
@@ -38,7 +38,7 @@ def replay
       webmock_response.raise_error_if_any
 
       invoke_callbacks(webmock_response, real_request: false)
-      ::HTTP::Response.from_webmock webmock_response, request_signature
+      ::HTTP::Response.from_webmock webmock_response, @request, request_signature
     end
 
     def raise_timeout_error