Merge pull request #516 from yusuke-ota/fix_test_response

Uncomment and fix tests/response

Author: yoshuawuyts

tests/response.rs

@@ -1,54 +1,74 @@
-// use async_std::task::block_on;
-// use tide::*;
-
-// #[test]
-// fn test_status() {
-//     let resp = "foo"
-//         .with_status(http::status::StatusCode::NOT_FOUND)
-//         .into_response();
-//     assert_eq!(resp.status(), http::status::StatusCode::NOT_FOUND);
-//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"foo");
-// }
-
-// #[test]
-// fn byte_vec_content_type() {
-//     let resp = String::from("foo").into_bytes().into_response();
-//     assert_eq!(resp.headers()["Content-Type"], "application/octet-stream");
-//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"foo");
-// }
-
-// #[test]
-// fn string_content_type() {
-//     let resp = String::from("foo").into_response();
-//     assert_eq!(resp.headers()["Content-Type"], "text/plain; charset=utf-8");
-//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"foo");
-// }
-
-// #[test]
-// fn json_content_type() {
-//     use std::collections::BTreeMap;
-
-//     let mut map = BTreeMap::new();
-//     map.insert(Some("a"), 2);
-//     map.insert(Some("b"), 4);
-//     map.insert(None, 6);
-
-//     let resp = json(map);
-//     assert_eq!(
-//         resp.status(),
-//         http::status::StatusCode::INTERNAL_SERVER_ERROR
-//     );
-//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"");
-
-//     let mut map = BTreeMap::new();
-//     map.insert("a", 2);
-//     map.insert("b", 4);
-//     map.insert("c", 6);
-
-//     let resp = json(map);
-//     assert_eq!(resp.status(), http::status::StatusCode::OK);
-//     assert_eq!(
-//         block_on(resp.into_body().into_vec()).unwrap(),
-//         br##"{"a":2,"b":4,"c":6}"##
-//     );
-// }
+use tide::*;
+
+#[async_std::test]
+async fn test_status() {
+    let mut resp = Response::new(StatusCode::NotFound).body_string("foo".to_string());
+    assert_eq!(resp.status(), StatusCode::NotFound);
+    let foo = resp.take_body().into_string().await.unwrap();
+    assert_eq!(foo.as_bytes(), b"foo");
+}
+
+#[async_std::test]
+async fn byte_vec_content_type() {
+    use async_std::io::Cursor;
+    use http_types::headers::HeaderName;
+    use std::str::FromStr;
+
+    let mut resp = Response::new(StatusCode::Ok).body(Cursor::new("foo"));
+    let header_values = resp
+        .header(&HeaderName::from_str("Content-Type").unwrap())
+        .unwrap();
+    assert_eq!(header_values[0], mime::APPLICATION_OCTET_STREAM.to_string());
+    let foo = resp.take_body().into_string().await.unwrap();
+    assert_eq!(foo.as_bytes(), b"foo");
+}
+
+#[async_std::test]
+async fn string_content_type() {
+    use http_types::headers::HeaderName;
+    use std::str::FromStr;
+
+    let mut resp = Response::new(StatusCode::Ok).body_string("foo".to_string());
+    let header_values = resp
+        .header(&HeaderName::from_str("Content-Type").unwrap())
+        .unwrap();
+    assert_eq!(header_values[0], mime::TEXT_PLAIN_UTF_8.to_string());
+    let foo = resp.take_body().into_string().await.unwrap();
+    assert_eq!(foo.as_bytes(), b"foo");
+}
+
+#[async_std::test]
+async fn json_content_type() {
+    use http_types::{Method, Url};
+    use std::collections::BTreeMap;
+
+    let mut app = tide::new();
+    app.at("/json_content_type").get(|_| async move {
+        let mut map = BTreeMap::new();
+        map.insert(Some("a"), 2);
+        map.insert(Some("b"), 4);
+        map.insert(None, 6);
+        let resp = Response::new(StatusCode::Ok).body_json(&map)?;
+        Ok(resp)
+    });
+    let req = http::Request::new(
+        Method::Get,
+        Url::parse("http://localhost/json_content_type").unwrap(),
+    );
+    let mut resp: http::Response = app.respond(req).await.unwrap();
+    assert_eq!(resp.status(), StatusCode::InternalServerError);
+    let body = resp.take_body().into_string().await.unwrap();
+    assert_eq!(body.as_bytes(), b"");
+
+    let mut resp = async move {
+        let mut map = BTreeMap::new();
+        map.insert("a", 2);
+        map.insert("b", 4);
+        map.insert("c", 6);
+        Response::new(StatusCode::Ok).body_json(&map).unwrap()
+    }
+    .await;
+    assert_eq!(resp.status(), StatusCode::Ok);
+    let body = resp.take_body().into_string().await.unwrap();
+    assert_eq!(body.as_bytes(), br##"{"a":2,"b":4,"c":6}"##);
+}