Make wasm-bindgen-test a dev dependency

seanmonstar · Nov 24, 2020 · e7be3ed · e7be3ed
1 parent 2ca0e26
commit e7be3ed
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 67 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -140,7 +140,6 @@ winreg = "0.7"
 js-sys = "0.3.45"
 wasm-bindgen = { version = "0.2.68", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.18"
-wasm-bindgen-test = "0.3"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
 version = "0.3.25"
@@ -157,6 +156,9 @@ features = [
     "ServiceWorkerGlobalScope",
 ]
 
+[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
+wasm-bindgen-test = "0.3"
+
 [[example]]
 name = "blocking"
 path = "examples/blocking.rs"

diff --git a/src/wasm/client.rs b/src/wasm/client.rs
@@ -299,71 +299,74 @@ impl Config {
     }
 }
 
-use wasm_bindgen_test::*;
-
-wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
-
-#[wasm_bindgen_test]
-async fn default_headers() {
-    use crate::header::{HeaderMap, HeaderValue, CONTENT_TYPE};
-
-    let mut headers = HeaderMap::new();
-    headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
-    headers.insert("x-custom", HeaderValue::from_static("flibbertigibbet"));
-    let client = crate::Client::builder()
-        .default_headers(headers)
-        .build()
-        .expect("client");
-    let mut req = client
-        .get("https://www.example.com")
-        .build()
-        .expect("request");
-    // merge headers as if client were about to issue fetch
-    client.merge_headers(&mut req);
-
-    let test_headers = req.headers();
-    assert!(test_headers.get(CONTENT_TYPE).is_some(), "content-type");
-    assert!(test_headers.get("x-custom").is_some(), "custom header");
-    assert!(test_headers.get("accept").is_none(), "no accept header");
-}
+#[cfg(test)]
+mod tests {
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+    #[wasm_bindgen_test]
+    async fn default_headers() {
+        use crate::header::{HeaderMap, HeaderValue, CONTENT_TYPE};
+
+        let mut headers = HeaderMap::new();
+        headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
+        headers.insert("x-custom", HeaderValue::from_static("flibbertigibbet"));
+        let client = crate::Client::builder()
+            .default_headers(headers)
+            .build()
+            .expect("client");
+        let mut req = client
+            .get("https://www.example.com")
+            .build()
+            .expect("request");
+        // merge headers as if client were about to issue fetch
+        client.merge_headers(&mut req);
+
+        let test_headers = req.headers();
+        assert!(test_headers.get(CONTENT_TYPE).is_some(), "content-type");
+        assert!(test_headers.get("x-custom").is_some(), "custom header");
+        assert!(test_headers.get("accept").is_none(), "no accept header");
+    }
+
+    #[wasm_bindgen_test]
+    async fn default_headers_clone() {
+        use crate::header::{HeaderMap, HeaderValue, CONTENT_TYPE};
+
+        let mut headers = HeaderMap::new();
+        headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
+        headers.insert("x-custom", HeaderValue::from_static("flibbertigibbet"));
+        let client = crate::Client::builder()
+            .default_headers(headers)
+            .build()
+            .expect("client");
+
+        let mut req = client
+            .get("https://www.example.com")
+            .header(CONTENT_TYPE, "text/plain")
+            .build()
+            .expect("request");
+        client.merge_headers(&mut req);
+        let headers1 = req.headers();
+
+        // confirm that request headers override defaults
+        assert_eq!(
+            headers1.get(CONTENT_TYPE).unwrap(),
+            "text/plain",
+            "request headers override defaults"
+        );
 
-#[wasm_bindgen_test]
-async fn default_headers_clone() {
-    use crate::header::{HeaderMap, HeaderValue, CONTENT_TYPE};
-
-    let mut headers = HeaderMap::new();
-    headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
-    headers.insert("x-custom", HeaderValue::from_static("flibbertigibbet"));
-    let client = crate::Client::builder()
-        .default_headers(headers)
-        .build()
-        .expect("client");
-
-    let mut req = client
-        .get("https://www.example.com")
-        .header(CONTENT_TYPE, "text/plain")
-        .build()
-        .expect("request");
-    client.merge_headers(&mut req);
-    let headers1 = req.headers();
-
-    // confirm that request headers override defaults
-    assert_eq!(
-        headers1.get(CONTENT_TYPE).unwrap(),
-        "text/plain",
-        "request headers override defaults"
-    );
-
-    // confirm that request headers don't change client defaults
-    let mut req2 = client
-        .get("https://www.example.com/x")
-        .build()
-        .expect("req 2");
-    client.merge_headers(&mut req2);
-    let headers2 = req2.headers();
-    assert_eq!(
-        headers2.get(CONTENT_TYPE).unwrap(),
-        "application/json",
-        "request headers don't change client defaults"
-    );
+        // confirm that request headers don't change client defaults
+        let mut req2 = client
+            .get("https://www.example.com/x")
+            .build()
+            .expect("req 2");
+        client.merge_headers(&mut req2);
+        let headers2 = req2.headers();
+        assert_eq!(
+            headers2.get(CONTENT_TYPE).unwrap(),
+            "application/json",
+            "request headers don't change client defaults"
+        );
+    }
 }