Merge pull request #207 from graphql-rust/snake-case-fragment

Fix fragments on unions

Author: tomhoule

graphql_client/tests/input_object_variables.rs

@@ -15,7 +15,7 @@ pub struct InputObjectVariablesQuery;
 
 #[test]
 fn input_object_variables_query_variables_struct() {
-    input_object_variables_query::Variables {
+    let _ = input_object_variables_query::Variables {
         msg: Some(input_object_variables_query::Message {
             content: None,
             to: Some(input_object_variables_query::Recipient {

graphql_client/tests/interfaces.rs

@@ -103,6 +103,7 @@ fn fragment_in_interface() {
                     name: "Audrey Lorde".to_string(),
                     public_status: PublicStatus {
                         display_name: false,
+                        on: PublicStatusOn::Person,
                     },
                     on: InterfaceWithFragmentQueryEverythingOn::Person(
                         InterfaceWithFragmentQueryEverythingOnPerson {
@@ -112,21 +113,28 @@ fn fragment_in_interface() {
                 },
                 InterfaceWithFragmentQueryEverything {
                     name: "Laïka".to_string(),
-                    public_status: PublicStatus { display_name: true },
+                    public_status: PublicStatus {
+                        display_name: true,
+                        on: PublicStatusOn::Dog
+                    },
                     on: InterfaceWithFragmentQueryEverythingOn::Dog(
                         InterfaceWithFragmentQueryEverythingOnDog { is_good_dog: true }
                     )
                 },
                 InterfaceWithFragmentQueryEverything {
                     name: "Mozilla".to_string(),
                     public_status: PublicStatus {
-                        display_name: false
+                        display_name: false,
+                        on: PublicStatusOn::Organization
                     },
                     on: InterfaceWithFragmentQueryEverythingOn::Organization,
                 },
                 InterfaceWithFragmentQueryEverything {
                     name: "Norbert".to_string(),
-                    public_status: PublicStatus { display_name: true },
+                    public_status: PublicStatus {
+                        display_name: true,
+                        on: PublicStatusOn::Dog
+                    },
                     on: InterfaceWithFragmentQueryEverythingOn::Dog(
                         InterfaceWithFragmentQueryEverythingOnDog { is_good_dog: true }
                     ),

graphql_client/tests/interfaces/interface_with_fragment_query.graphql

@@ -1,4 +1,5 @@
 fragment PublicStatus on Named {
+  __typename
   displayName
 }
 

graphql_client/tests/introspection.rs

@@ -14,12 +14,9 @@ extern crate serde_json;
 pub struct IntrospectionQuery;
 
 #[test]
-fn introspection_schema() {
-    ()
-}
+fn introspection_schema() {}
 
-const INTROSPECTION_RESPONSE: &'static str =
-    include_str!("./introspection/introspection_response.json");
+const INTROSPECTION_RESPONSE: &str = include_str!("./introspection/introspection_response.json");
 
 #[test]
 fn leading_underscores_are_preserved() {

graphql_client/tests/operation_selection.rs

@@ -41,8 +41,8 @@ pub struct Unrelated;
 )]
 pub struct SelectedOperation;
 
-const HEIGHTS_RESPONSE: &'static str = r##"{"mountainHeight": 224, "buildingHeight": 12}"##;
-const ECHO_RESPONSE: &'static str = r##"{"echo": "tiramisù"}"##;
+const HEIGHTS_RESPONSE: &str = r##"{"mountainHeight": 224, "buildingHeight": 12}"##;
+const ECHO_RESPONSE: &str = r##"{"echo": "tiramisù"}"##;
 
 #[test]
 fn operation_selection_works() {

graphql_client/tests/scalar_variables.rs

@@ -14,7 +14,7 @@ pub struct ScalarVariablesQuery;
 
 #[test]
 fn scalar_variables_query_variables_struct() {
-    scalar_variables_query::Variables {
+    let _ = scalar_variables_query::Variables {
         msg: "hello".to_string(),
         reps: Some(32),
     };

graphql_client/tests/union_query.rs

@@ -15,6 +15,14 @@ const RESPONSE: &'static str = include_str!("unions/union_query_response.json");
 )]
 pub struct UnionQuery;
 
+#[derive(GraphQLQuery)]
+#[graphql(
+    query_path = "tests/unions/union_query.graphql",
+    schema_path = "tests/unions/union_schema.graphql",
+    response_derives = "PartialEq, Debug"
+)]
+pub struct FragmentOnUnion;
+
 #[test]
 fn union_query_deserialization() {
     let response_data: union_query::ResponseData = serde_json::from_str(RESPONSE).unwrap();
@@ -41,3 +49,35 @@ fn union_query_deserialization() {
 
     assert_eq!(response_data.names.map(|names| names.len()), Some(4));
 }
+
+#[test]
+fn fragment_on_union() {
+    let response_data: fragment_on_union::ResponseData = serde_json::from_str(RESPONSE).unwrap();
+
+    let expected = fragment_on_union::ResponseData {
+        names: Some(vec![
+            fragment_on_union::FragmentOnUnionNames::Person(
+                fragment_on_union::FragmentOnUnionNamesOnPerson {
+                    first_name: "Audrey".to_string(),
+                },
+            ),
+            fragment_on_union::FragmentOnUnionNames::Dog(
+                fragment_on_union::FragmentOnUnionNamesOnDog {
+                    name: "Laïka".to_string(),
+                },
+            ),
+            fragment_on_union::FragmentOnUnionNames::Organization(
+                fragment_on_union::FragmentOnUnionNamesOnOrganization {
+                    title: "Mozilla".to_string(),
+                },
+            ),
+            fragment_on_union::FragmentOnUnionNames::Dog(
+                fragment_on_union::FragmentOnUnionNamesOnDog {
+                    name: "Norbert".to_string(),
+                },
+            ),
+        ]),
+    };
+
+    assert_eq!(response_data, expected);
+}

graphql_client/tests/unions/union_query.graphql

@@ -13,3 +13,22 @@ query MyQuery {
     }
   }
 }
+
+fragment NamesFragment on NamedThing {
+  __typename
+  ... on Dog {
+    name
+  }
+  ... on Person {
+    firstName
+  }
+  ... on Organization {
+    title
+  }
+}
+
+query FragmentOnUnion {
+  names {
+    ...NamesFragment
+  }
+}

graphql_client_cli/src/generate.rs

@@ -2,13 +2,13 @@ use failure;
 use graphql_client_codegen::*;
 use std::fs::File;
 use std::io::Write as IoWrite;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use syn;
 
 #[allow(clippy::too_many_arguments)]
 pub fn generate_code(
     query_path: PathBuf,
-    schema_path: PathBuf,
+    schema_path: &Path,
     module_name: String,
     selected_operation: Option<String>,
     additional_derives: Option<String>,
@@ -47,7 +47,7 @@ pub fn generate_code(
         module_visibility,
     };
 
-    let gen = generate_module_token_stream(query_path, schema_path, Some(options))?;
+    let gen = generate_module_token_stream(query_path, &schema_path, Some(options))?;
 
     let mut file = File::create(output.clone())?;
 

graphql_client_cli/src/main.rs

@@ -96,7 +96,7 @@ fn main() -> Result<(), failure::Error> {
             output,
         } => generate::generate_code(
             query_path,
-            schema_path,
+            &schema_path,
             module_name,
             selected_operation,
             additional_derives,