diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index d5f70bd3b90..fde10ff00f0 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -179,29 +179,6 @@ impl HttpRequest for MockRequest { } } -struct AssertRequestMustHaveHeaders { - expected_headers: Headers, - request_headers: Headers, - t: ResponseType -} - -impl AssertRequestMustHaveHeaders { - fn new(t: ResponseType, expected_headers: Headers) -> Self { - AssertRequestMustHaveHeaders { expected_headers: expected_headers, request_headers: Headers::new(), t: t } - } -} - -impl HttpRequest for AssertRequestMustHaveHeaders { - type R = MockResponse; - - fn headers_mut(&mut self) -> &mut Headers { &mut self.request_headers } - - fn send(self, _: &Option>) -> Result { - assert_eq!(self.request_headers, self.expected_headers); - response_for_request_type(self.t) - } -} - struct AssertAuthHeaderRequest { expected_headers: Headers, request_headers: Headers, @@ -285,15 +262,11 @@ struct AssertMustHaveHeadersRequestFactory { } impl HttpRequestFactory for AssertMustHaveHeadersRequestFactory { - type R = AssertRequestMustHaveHeaders; + type R = MockRequest; - fn create(&self, _: Url, _: Method) -> Result { - Ok( - AssertRequestMustHaveHeaders::new( - ResponseType::Text(self.body.clone()), - self.expected_headers.clone() - ) - ) + fn create_with_headers(&self, _: Url, _: Method, headers: Headers) -> Result { + assert_eq!(headers, self.expected_headers); + Ok(MockRequest::new(ResponseType::Text(self.body.clone()))) } }