Merge pull request http-rs#130 from http-rs/zkat/mock-tests

tests: stop hitting the network when running the test suite

Cargo.toml

@@ -75,3 +75,4 @@ features = [
 async-std = { version = "1.0", features = ["attributes"] }
 femme = "1.1.0"
 serde = { version = "1.0.97", features = ["derive"] }
+mockito = "0.22.0"

src/middleware/logger/mod.rs

@@ -2,7 +2,7 @@
 //!
 //! # Examples
 //!
-//! ```
+//! ```no_run
 //! # #[async_std::main]
 //! # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 //! let mut res = surf::get("https://httpbin.org/get")
@@ -28,7 +28,7 @@ use native::Logger;
 ///
 /// # Examples
 ///
-/// ```
+/// ```no_run
 /// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let mut res = surf::get("https://httpbin.org/get")

src/middleware/mod.rs

@@ -1,7 +1,7 @@
 //! Middleware types
 //!
 //! # Examples
-//! ```
+//! ```no_run
 //! use futures::future::BoxFuture;
 //! use surf::middleware::{Next, Middleware, Request, Response, HttpClient};
 //! use std::time;
@@ -30,7 +30,7 @@
 //! `Middleware` can also be instantiated using a free function thanks to some convenient trait
 //! implementations.
 //!
-//! ```
+//! ```no_run
 //! use futures::future::BoxFuture;
 //! use surf::middleware::{Next, Middleware, Request, Response, HttpClient};
 //! use std::time;

src/request.rs

@@ -113,7 +113,7 @@ impl<C: HttpClient> Request<C> {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # use serde::{Deserialize, Serialize};
     /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -140,7 +140,7 @@ impl<C: HttpClient> Request<C> {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # use serde::{Deserialize, Serialize};
     /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
@@ -173,7 +173,7 @@ impl<C: HttpClient> Request<C> {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let req = surf::get("https://httpbin.org/get")
@@ -193,7 +193,7 @@ impl<C: HttpClient> Request<C> {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let req = surf::get("https://httpbin.org/get")
@@ -234,7 +234,7 @@ impl<C: HttpClient> Request<C> {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// use surf::http;
@@ -251,7 +251,7 @@ impl<C: HttpClient> Request<C> {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// use surf::url::Url;
@@ -278,7 +278,7 @@ impl<C: HttpClient> Request<C> {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// use surf::mime;
@@ -298,7 +298,7 @@ impl<C: HttpClient> Request<C> {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// use surf::mime;
@@ -450,7 +450,7 @@ impl<C: HttpClient> Request<C> {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// # use serde::{Deserialize, Serialize};
     /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {

tests/test.rs

@@ -1,3 +1,5 @@
+use mockito::mock;
+
 #[async_std::test]
 async fn post_json() -> Result<(), surf::Exception> {
     #[derive(serde::Deserialize, serde::Serialize)]
@@ -9,22 +11,30 @@ async fn post_json() -> Result<(), surf::Exception> {
         name: "Chashu".to_string(),
     };
 
-    let res = surf::post("https://httpbin.org/post")
-        .body_json(&cat)?
-        .await?;
+    let m = mock("POST", "/")
+        .with_status(200)
+        .match_body(&serde_json::to_string(&cat)?[..])
+        .with_body(&serde_json::to_string(&cat)?[..])
+        .create();
+    let res = surf::post(mockito::server_url()).body_json(&cat)?.await?;
+    m.assert();
     assert_eq!(res.status(), 200);
     Ok(())
 }
 
 #[async_std::test]
 async fn get_json() -> Result<(), surf::Exception> {
     #[derive(serde::Deserialize)]
-    struct Ip {
-        ip: String,
+    struct Message {
+        message: String,
     }
-
-    let uri = "https://api.ipify.org?format=json";
-    let ip: Ip = surf::get(uri).recv_json().await?;
-    assert!(ip.ip.len() > 10);
+    let m = mock("GET", "/")
+        .with_status(200)
+        .with_body(r#"{"message": "hello, world!"}"#)
+        .create();
+    let uri = &mockito::server_url();
+    let msg: Message = surf::get(uri).recv_json().await?;
+    m.assert();
+    assert_eq!(msg.message, "hello, world!");
     Ok(())
 }