Merge pull request #167 from graphql-rust/schema-with-data-field

Make json schemas work both with and without data field

Author: tomhoule

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Better error messages from the derive macro stwhen the schema or the query file path is not found.
 
+## Fixed
+
+- Support both full introspection responses (with "data") field and just the content of the "data" field in schema.json files.
+
 ## 0.5.0
 
 ### Added

graphql_client/tests/json_schema.rs

@@ -0,0 +1,44 @@
+#[macro_use]
+extern crate graphql_client;
+#[macro_use]
+extern crate serde_derive;
+extern crate serde;
+#[macro_use]
+extern crate serde_json;
+
+type Uuid = String;
+
+#[derive(GraphQLQuery)]
+#[graphql(
+    query_path = "tests/json_schema/query.graphql",
+    schema_path = "tests/json_schema/schema_1.json",
+    response_derives = "Debug,PartialEq"
+)]
+pub struct WithSchema1;
+
+#[derive(GraphQLQuery)]
+#[graphql(
+    query_path = "tests/json_schema/query.graphql",
+    schema_path = "tests/json_schema/schema_2.json",
+    response_derives = "Debug"
+)]
+pub struct WithSchema2;
+
+#[test]
+fn json_schemas_work_with_and_without_data_field() {
+    let response = json!({
+        "data": {
+            "currentSession": null,
+        },
+    });
+
+    let schema_1_result: graphql_client::Response<with_schema1::ResponseData> =
+        serde_json::from_value(response.clone()).unwrap();
+    let schema_2_result: graphql_client::Response<with_schema2::ResponseData> =
+        serde_json::from_value(response).unwrap();
+
+    assert_eq!(
+        format!("{:?}", schema_1_result),
+        format!("{:?}", schema_2_result)
+    );
+}

graphql_client/tests/json_schema/query.graphql

@@ -0,0 +1,5 @@
+query CurrentSession {
+  currentSession {
+    accountId
+  }
+}