Fix tests query and use async/await in tests.

Author: boxdot

graphql_client/src/web.rs

@@ -79,7 +79,6 @@ impl Client {
         _query: Q,
         variables: Q::Variables,
     ) -> Result<crate::Response<Q::ResponseData>, ClientError> {
-        // this can be removed when we convert to async/await
         let window = web_sys::window().ok_or_else(|| ClientError::NoWindow)?;
         let body =
             serde_json::to_string(&Q::build_query(variables)).map_err(|_| ClientError::Body)?;

graphql_client/tests/Germany.graphql

@@ -7,7 +7,7 @@ query Germany {
   }
 }
 
-query Country($countryCode: String!) {
+query Country($countryCode: ID!) {
   country(code: $countryCode) {
     name
     continent {

graphql_client/tests/web.rs

@@ -1,9 +1,6 @@
 #![cfg(target_arch = "wasm32")]
 
-use futures::Future;
 use graphql_client::{web::Client, GraphQLQuery};
-use wasm_bindgen::JsValue;
-use wasm_bindgen_test::wasm_bindgen_test_configure;
 use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);
@@ -18,30 +15,27 @@ fn build_client() {
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "tests/countries_schema.json",
-    query_path = "tests/Germany.graphql"
+    query_path = "tests/Germany.graphql",
+    response_derives = "Debug"
 )]
 struct Germany;
 
-#[wasm_bindgen_test(async)]
-fn test_germany() -> impl Future<Item = (), Error = JsValue> {
-    Client::new("https://countries.trevorblades.com/")
+#[wasm_bindgen_test]
+async fn test_germany() {
+    let response = Client::new("https://countries.trevorblades.com/")
         .call(Germany, germany::Variables)
-        .map(|response| {
-            let continent_name = response
-                .data
-                .expect("response data is not null")
-                .country
-                .expect("country is not null")
-                .continent
-                .expect("continent is not null")
-                .name
-                .expect("germany is on a continent");
-
-            assert_eq!(continent_name, "Europe");
-        })
-        .map_err(|err| {
-            panic!("{:?}", err);
-        })
+        .await
+        .expect("successful response");
+    let continent_name = response
+        .data
+        .expect("response data is not null")
+        .country
+        .expect("country is not null")
+        .continent
+        .expect("continent is not null")
+        .name
+        .expect("germany is on a continent");
+    assert_eq!(continent_name, "Europe");
 }
 
 #[derive(GraphQLQuery)]
@@ -51,50 +45,44 @@ fn test_germany() -> impl Future<Item = (), Error = JsValue> {
 )]
 struct Country;
 
-#[wasm_bindgen_test(async)]
-fn test_country() -> impl Future<Item = (), Error = JsValue> {
-    Client::new("https://countries.trevorblades.com/")
+#[wasm_bindgen_test]
+async fn test_country() {
+    let response = Client::new("https://countries.trevorblades.com/")
         .call(
             Country,
             country::Variables {
                 country_code: "CN".to_owned(),
             },
         )
-        .map(|response| {
-            let continent_name = response
-                .data
-                .expect("response data is not null")
-                .country
-                .expect("country is not null")
-                .continent
-                .expect("continent is not null")
-                .name
-                .expect("country is on a continent");
-
-            assert_eq!(continent_name, "Asia");
-        })
-        .map_err(|err| {
-            panic!("{:?}", err);
-        })
+        .await
+        .expect("successful response");
+    let continent_name = response
+        .data
+        .expect("response data is not null")
+        .country
+        .expect("country is not null")
+        .continent
+        .expect("continent is not null")
+        .name
+        .expect("country is on a continent");
+    assert_eq!(continent_name, "Asia");
 }
 
-#[wasm_bindgen_test(async)]
-fn test_bad_url() -> impl Future<Item = (), Error = JsValue> {
-    Client::new("https://example.com/non-existent/graphql/endpoint")
+#[wasm_bindgen_test]
+async fn test_bad_url() {
+    let result = Client::new("https://example.com/non-existent/graphql/endpoint")
         .call(
             Country,
             country::Variables {
                 country_code: "CN".to_owned(),
             },
         )
-        .map(|_response| panic!("The API endpoint does not exist, this should not be called."))
-        .map_err(|err| {
-            assert_eq!(
-                err,
-                graphql_client::web::ClientError::Network(
-                    "NetworkError when attempting to fetch resource.".into()
-                )
-            );
-        })
-        .then(|_| Ok(()))
+        .await;
+    match result {
+        Ok(_response) => panic!("The API endpoint does not exist, this should not be called."),
+        Err(graphql_client::web::ClientError::Network(msg)) => {
+            assert_eq!(msg, "NetworkError when attempting to fetch resource.")
+        }
+        Err(err) => panic!("unexpected error: {}", err),
+    }
 }