diff --git a/src/net/result.rs b/src/net/result.rs index 0397dba..a7c9ac0 100644 --- a/src/net/result.rs +++ b/src/net/result.rs @@ -9,6 +9,7 @@ pub enum Error { #[display("Unexpected request: {0}", 0.to_string())] UnexpectedMockRequest(reqwest::Request), RwLockLocked, + Http(http::Error), } impl std::error::Error for Error {} impl Clone for Error { diff --git a/src/net/system.rs b/src/net/system.rs index 247f9b7..64e446d 100644 --- a/src/net/system.rs +++ b/src/net/system.rs @@ -1,5 +1,7 @@ // -use std::{marker::PhantomData, ops::Deref, sync::RwLock}; +use std::{marker::PhantomData, sync::RwLock}; + +use reqwest::Client; use super::{Error, Result}; @@ -56,7 +58,10 @@ impl Net { Default::default() } - pub async fn send(&self, request: reqwest::RequestBuilder) -> Result { + pub async fn send( + &self, + request: impl Into, + ) -> Result { match &self.mock { Some(mock) => mock.send(request).await, None => self.inner.send(request).await, @@ -68,17 +73,29 @@ impl Net { pub struct MockNet { inner: InnerNet, } -impl Deref for MockNet { - type Target = InnerNet; - - fn deref(&self) -> &Self::Target { - &self.inner +impl MockNet { + pub fn client(&self) -> Client { + self.inner.client() + } + pub fn on(&self, request: impl Into) -> OnRequest { + self.inner.on(request) + } + pub fn response(&self) -> http::response::Builder { + self.inner.response() + } + pub async fn send(&self, request: impl Into) -> Result { + self.inner.send(request).await + } + pub fn reset(&self) -> Result<()> { + self.inner.reset() } } impl From for Net { fn from(mock_net: MockNet) -> Self { Self { inner: InnerNet::::new(), + // keep the original `inner` around to allow it's Drop impelmentation to run when we go + // out of scope at the end of the test mock: Some(mock_net.inner), } } @@ -97,8 +114,11 @@ impl InnerNet { } } - pub async fn send(&self, request: reqwest::RequestBuilder) -> Result { - request.send().await.map_err(Error::from) + pub async fn send( + &self, + request: impl Into, + ) -> Result { + request.into().send().await.map_err(Error::from) } } @@ -115,8 +135,11 @@ impl InnerNet { } } - pub async fn send(&self, request: reqwest::RequestBuilder) -> Result { - let request = request.build()?; + pub async fn send( + &self, + request: impl Into, + ) -> Result { + let request = request.into().build()?; let read_plans = self.plans.read().map_err(|_| Error::RwLockLocked)?; let index = read_plans.iter().position(|plan| { // METHOD @@ -163,10 +186,10 @@ impl InnerNet { Default::default() } - pub fn on(&self, request: reqwest::Request) -> OnRequest { + pub fn on(&self, request: impl Into) -> OnRequest { OnRequest { net: self, - request, + request: request.into(), match_on: vec![MatchOn::Method, MatchOn::Url], } } @@ -214,7 +237,7 @@ impl<'net> OnRequest<'net> { match_on, } } - pub fn respond(self, response: reqwest::Response) -> Result<()> { - self.net._on(self.request, response, self.match_on) + pub fn respond(self, response: impl Into) -> Result<()> { + self.net._on(self.request, response.into(), self.match_on) } } diff --git a/tests/net.rs b/tests/net.rs index 248dc56..5648463 100644 --- a/tests/net.rs +++ b/tests/net.rs @@ -17,7 +17,7 @@ async fn test_get_url() { .expect("request body"); net.on(request) - .respond(my_response.into()) + .respond(my_response) .expect("on request, respond"); //when @@ -46,7 +46,7 @@ async fn test_get_wrong_url() { .expect("request body"); net.on(request) - .respond(my_response.into()) + .respond(my_response) .expect("on request, respond"); //when @@ -77,7 +77,7 @@ async fn test_post_url() { .expect("request body"); net.on(request) - .respond(my_response.into()) + .respond(my_response) .expect("on request, respond"); //when @@ -110,7 +110,7 @@ async fn test_post_by_method() { MatchOn::Method, // MatchOn::Url ]) - .respond(my_response.into()) + .respond(my_response) .expect("on request, respond"); //when @@ -144,7 +144,7 @@ async fn test_post_by_url() { // MatchOn::Method, MatchOn::Url, ]) - .respond(my_response.into()) + .respond(my_response) .expect("on request, respond"); //when @@ -183,7 +183,7 @@ async fn test_post_by_body() { // MatchOn::Url MatchOn::Body, ]) - .respond(my_response.into()) + .respond(my_response) .expect("on request, respond"); //when @@ -226,7 +226,7 @@ async fn test_post_by_headers() { // MatchOn::Url MatchOn::Headers, ]) - .respond(my_response.into()) + .respond(my_response) .expect("on request, respond"); //when @@ -265,7 +265,7 @@ async fn test_unused_post() { .expect("request body"); net.on(request) - .respond(my_response.into()) + .respond(my_response) .expect("on request, respond"); //when