From 505ad0098d40e6da28cea374ac78d6daec8c9daa Mon Sep 17 00:00:00 2001 From: Joshua Flanagan Date: Thu, 25 Apr 2019 12:02:01 -0500 Subject: [PATCH] Make HTTP.rb adapter work with new versions Versions of HTTP.rb that allow access to the Request from the Response (https://github.com/httprb/http/pull/546) require this change to continue working. --- lib/webmock/http_lib_adapters/http_rb/response.rb | 5 +++-- lib/webmock/http_lib_adapters/http_rb/webmock.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/webmock/http_lib_adapters/http_rb/response.rb b/lib/webmock/http_lib_adapters/http_rb/response.rb index 3628f699b..f4c487a77 100644 --- 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 index 256764ad5..4db65aff2 100644 --- 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