Write end-to-end test for union deserialization

Author: tomhoule

Cargo.toml

@@ -14,6 +14,9 @@ graphql-parser = "0.2.0"
 serde = "1.0"
 serde_derive = "1.0"
 
+[dev-dependencies]
+serde_json = "1.0"
+
 [workspace]
 members = [
     ".",

graphql_query_derive/src/shared.rs

@@ -5,11 +5,11 @@ pub fn render_object_field(field_name: &str, field_type: TokenStream) -> TokenSt
         let name_ident = Ident::new(&format!("{}_", field_name), Span::call_site());
         return quote! {
             #[serde(rename = #field_name)]
-            #name_ident: #field_type
+            pub #name_ident: #field_type
         };
     }
 
     let name_ident = Ident::new(field_name, Span::call_site());
 
-    quote!(#name_ident: #field_type)
+    quote!(pub #name_ident: #field_type)
 }

graphql_query_derive/src/unions.rs

@@ -103,7 +103,7 @@ impl GqlUnion {
         Ok(quote!{
             #(#children_definitions)*
 
-            #[derive(Deserialize)]
+            #[derive(Debug, Serialize, Deserialize)]
             #[serde(tag = "__typename")]
             pub enum #struct_name {
                 #(#variants),*
@@ -278,10 +278,10 @@ mod tests {
             result.unwrap().to_string(),
             vec![
                 "# [ derive ( Debug , Serialize , Deserialize ) ] ",
-                "pub struct MeowOnUser { first_name : String , } ",
+                "pub struct MeowOnUser { pub first_name : String , } ",
+                "# [ derive ( Debug , Serialize , Deserialize ) ] ",
+                "pub struct MeowOnOrganization { pub title : String , } ",
                 "# [ derive ( Debug , Serialize , Deserialize ) ] ",
-                "pub struct MeowOnOrganization { title : String , } ",
-                "# [ derive ( Deserialize ) ] ",
                 "# [ serde ( tag = \"__typename\" ) ] ",
                 "pub enum Meow { User ( MeowOnUser ) , Organization ( MeowOnOrganization ) }",
             ].into_iter()

tests/union_query.graphql

@@ -0,0 +1,15 @@
+query MyQuery {
+    names {
+        __typename
+        ...on Dog {
+            name
+        }
+        ...on Person {
+            firstName
+            lastName
+        }
+        ...on Organization {
+            title
+        }
+    }
+}

tests/union_query.rs

@@ -0,0 +1,29 @@
+#[macro_use]
+extern crate graphql_client;
+#[macro_use]
+extern crate serde_derive;
+extern crate serde;
+extern crate serde_json;
+
+const RESPONSE: &'static str = include_str!("union_query_response.json");
+
+#[derive(GraphQLQuery)]
+#[GraphQLQuery(
+    query_path = "tests/union_query.graphql",
+    schema_path = "tests/union_schema.graphql",
+)]
+struct UnionQuery;
+
+#[test]
+fn union_query_deserialization() {
+    let response_data: union_query::ResponseData = serde_json::from_str(RESPONSE).unwrap();
+
+    println!("{:?}", response_data);
+
+    let expected = r##"ResponseData { names: Some([Some(Person(RustMyQueryNamesOnPerson { firstName: Some("Audrey"), lastName: Some("Lorde") })), Some(Dog(RustMyQueryNamesOnDog { name: Some("Laïka") })), Some(Organization(RustMyQueryNamesOnOrganization { title: Some("Mozilla") })), Some(Dog(RustMyQueryNamesOnDog { name: Some("Norbert") }))]) }"##;
+
+    assert_eq!(format!("{:?}", response_data), expected);
+
+    assert_eq!(response_data.names.map(|names| names.len()), Some(4));
+
+}

tests/union_query_response.json

@@ -0,0 +1,21 @@
+{
+    "names": [
+        {
+            "__typename": "Person",
+            "firstName": "Audrey",
+            "lastName": "Lorde"
+        },
+        {
+            "__typename": "Dog",
+            "name": "Laïka"
+        },
+        {
+            "__typename": "Organization",
+            "title": "Mozilla"
+        },
+        {
+            "__typename": "Dog",
+            "name": "Norbert"
+        }
+    ]
+}

tests/union_schema.graphql

@@ -0,0 +1,28 @@
+schema {
+    query: UnionQuery
+}
+
+type Person {
+    firstName: String!
+    lastName: String
+    birthday: String
+}
+
+type Organization {
+    title: String!
+    createdAt: String
+}
+
+type Dog {
+    name: String!
+    """
+    Always returns true
+    """
+    isGoodDog: Boolean!
+}
+
+union NamedThing = Person | Dog | Organization
+
+type UnionQuery {
+    names: [NamedThing!]
+}