diff --git a/Cargo.lock b/Cargo.lock index 849ee1d7..7d14dfd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -369,13 +369,13 @@ dependencies = [ [[package]] name = "console" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" dependencies = [ "encode_unicode", - "lazy_static", "libc", + "once_cell", "terminal_size", "winapi", ] @@ -688,12 +688,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - [[package]] name = "either" version = "1.6.1" @@ -1209,17 +1203,16 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] name = "insta" -version = "1.9.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c4e56d571b4cc829f0ce71506bd865a90369eeab5f3d3657ba96230beb8012" +checksum = "1585a0f4924236ca3c8dac97bc6a3efaacc08b1ed9264ff2155ec7ab2906a8ea" dependencies = [ "console", - "lazy_static", + "once_cell", "serde", "serde_json", "serde_yaml", "similar", - "uuid", ] [[package]] @@ -2050,12 +2043,12 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.17" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "dtoa", - "linked-hash-map", + "indexmap", + "ryu", "serde", "yaml-rust", ] diff --git a/cynic-codegen/Cargo.toml b/cynic-codegen/Cargo.toml index 485de12d..420cfd83 100644 --- a/cynic-codegen/Cargo.toml +++ b/cynic-codegen/Cargo.toml @@ -28,6 +28,6 @@ once_cell = "1.9.0" [dev-dependencies] assert_matches = "1.4.0" -insta = "1.9" +insta = "1.17" maplit = "1.0.2" rstest = "0.11.0" diff --git a/cynic-codegen/src/enum_derive/snapshots/cynic_codegen__enum_derive__tests__input_1.snap b/cynic-codegen/src/enum_derive/snapshots/cynic_codegen__enum_derive__tests__snapshot_enum_derive.snap similarity index 99% rename from cynic-codegen/src/enum_derive/snapshots/cynic_codegen__enum_derive__tests__input_1.snap rename to cynic-codegen/src/enum_derive/snapshots/cynic_codegen__enum_derive__tests__snapshot_enum_derive.snap index c580254b..a64a6cbb 100644 --- a/cynic-codegen/src/enum_derive/snapshots/cynic_codegen__enum_derive__tests__input_1.snap +++ b/cynic-codegen/src/enum_derive/snapshots/cynic_codegen__enum_derive__tests__snapshot_enum_derive.snap @@ -2,7 +2,6 @@ source: cynic-codegen/src/enum_derive/mod.rs assertion_line: 390 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl ::cynic::Enum for States { diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_04_a_list_of_strings.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__a_list_of_strings.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_04_a_list_of_strings.snap rename to cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__a_list_of_strings.snap index 5c2bb31c..a9080929 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_04_a_list_of_strings.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__a_list_of_strings.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 32 +assertion_line: 36 expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" - --- Ok( [ diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_06_an_enum.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__an_enum.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_06_an_enum.snap rename to cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__an_enum.snap index a79ac0e8..573f447f 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_06_an_enum.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__an_enum.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 32 +assertion_line: 36 expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" - --- Ok( [ diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__analyse_errors_without_argument_struct.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__analyse_errors_without_argument_struct.snap index 90344fd0..efd33e12 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__analyse_errors_without_argument_struct.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__analyse_errors_without_argument_struct.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 52 +assertion_line: 59 expression: "analyse(literals, field, None, Span::call_site()).map(|o| o.arguments)" - --- Err( Errors { diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_10_boolean_scalar.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__boolean_scalar.snap similarity index 97% rename from cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_10_boolean_scalar.snap rename to cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__boolean_scalar.snap index a6e6dec8..4dc45828 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_10_boolean_scalar.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__boolean_scalar.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 32 +assertion_line: 36 expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" - --- Ok( [ diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_03_empty_nullable_args.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_03_empty_nullable_args.snap deleted file mode 100644 index a610b078..00000000 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_03_empty_nullable_args.snap +++ /dev/null @@ -1,9 +0,0 @@ ---- -source: cynic-codegen/src/fragment_derive_2/arguments/tests.rs -assertion_line: 30 -expression: "analyse(literals, field, Span::call_site()).map(|o| o.arguments)" - ---- -Ok( - [], -) diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_11_missing_parameter.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_11_missing_parameter.snap deleted file mode 100644 index a429c839..00000000 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_11_missing_parameter.snap +++ /dev/null @@ -1,15 +0,0 @@ ---- -source: cynic-codegen/src/fragment_derive_2/arguments/tests.rs -assertion_line: 30 -expression: "analyse(literals, field, Span::call_site()).map(|o| o.arguments)" - ---- -Err( - Errors { - errors: [ - Error( - "missing fields - filters", - ), - ], - }, -) diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_12_unknown_parameter.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_12_unknown_parameter.snap deleted file mode 100644 index c49d1e09..00000000 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_12_unknown_parameter.snap +++ /dev/null @@ -1,15 +0,0 @@ ---- -source: cynic-codegen/src/fragment_derive_2/arguments/tests.rs -assertion_line: 30 -expression: "analyse(literals, field, Span::call_site()).map(|o| o.arguments)" - ---- -Err( - Errors { - errors: [ - Error( - "no such field", - ), - ], - }, -) diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__empty_nullable_args.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__empty_nullable_args.snap new file mode 100644 index 00000000..35a2d013 --- /dev/null +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__empty_nullable_args.snap @@ -0,0 +1,8 @@ +--- +source: cynic-codegen/src/fragment_derive/arguments/tests.rs +assertion_line: 36 +expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" +--- +Ok( + [], +) diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_05_list_wrapping.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__list_wrapping.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_05_list_wrapping.snap rename to cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__list_wrapping.snap index 04098f2c..45f8f671 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_05_list_wrapping.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__list_wrapping.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 32 +assertion_line: 36 expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" - --- Ok( [ diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_02_missing_nullable_scalars.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__missing_nullable_scalars.snap similarity index 97% rename from cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_02_missing_nullable_scalars.snap rename to cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__missing_nullable_scalars.snap index c70600ea..50a7cbb4 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_02_missing_nullable_scalars.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__missing_nullable_scalars.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 32 +assertion_line: 36 expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" - --- Ok( [ diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__missing_parameter.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__missing_parameter.snap new file mode 100644 index 00000000..13b245c3 --- /dev/null +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__missing_parameter.snap @@ -0,0 +1,14 @@ +--- +source: cynic-codegen/src/fragment_derive/arguments/tests.rs +assertion_line: 36 +expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" +--- +Err( + Errors { + errors: [ + Error( + "missing fields - filters", + ), + ], + }, +) diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_01_scalars.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__scalars.snap similarity index 98% rename from cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_01_scalars.snap rename to cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__scalars.snap index 6996b8bc..6aaaa4fa 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_01_scalars.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__scalars.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 32 +assertion_line: 36 expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" - --- Ok( [ diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_08_top_level_variable.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__top_level_variable.snap similarity index 98% rename from cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_08_top_level_variable.snap rename to cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__top_level_variable.snap index 50654d54..3987e6fb 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_08_top_level_variable.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__top_level_variable.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 32 +assertion_line: 36 expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" - --- Ok( [ diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_09_top_level_variable.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__top_level_variables.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_09_top_level_variable.snap rename to cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__top_level_variables.snap index 2ac40d73..d285df19 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_09_top_level_variable.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__top_level_variables.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 32 +assertion_line: 36 expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" - --- Ok( [ diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__unknown_parameter.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__unknown_parameter.snap new file mode 100644 index 00000000..444d9184 --- /dev/null +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__unknown_parameter.snap @@ -0,0 +1,14 @@ +--- +source: cynic-codegen/src/fragment_derive/arguments/tests.rs +assertion_line: 36 +expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" +--- +Err( + Errors { + errors: [ + Error( + "no such field", + ), + ], + }, +) diff --git a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_07_variable_in_object.snap b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__variable_in_object.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_07_variable_in_object.snap rename to cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__variable_in_object.snap index d78194b5..b23b220e 100644 --- a/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__case_07_variable_in_object.snap +++ b/cynic-codegen/src/fragment_derive/arguments/snapshots/cynic_codegen__fragment_derive__arguments__tests__variable_in_object.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/arguments/tests.rs -assertion_line: 32 +assertion_line: 36 expression: "analyse(literals, field, Some(&format_ident!(\"MyArguments\").into()),\n Span::call_site()).map(|o| o.arguments)" - --- Ok( [ diff --git a/cynic-codegen/src/fragment_derive/arguments/tests.rs b/cynic-codegen/src/fragment_derive/arguments/tests.rs index 3d83fb16..b3973ab6 100644 --- a/cynic-codegen/src/fragment_derive/arguments/tests.rs +++ b/cynic-codegen/src/fragment_derive/arguments/tests.rs @@ -7,19 +7,23 @@ use crate::schema::{parse_schema, types::Type, Schema}; use super::{analyse::analyse, parsing::CynicArguments}; #[rstest] -#[case::scalars("someScalarParams", parse_quote! { anInt: 1, aFloat: 3, anId: "hello" })] -#[case::missing_nullable_scalars("someNullableScalarParams", parse_quote! { anInt: 1 })] -#[case::empty_nullable_args("someNullableScalarParams", parse_quote! {})] -#[case::a_list_of_strings("filteredBooks", parse_quote! { filters: { authors: ["Charles Stross", "Ann Leckie"] } })] -#[case::list_wrapping("filteredBooks", parse_quote! { filters: { authors: "Ann Leckie" } })] -#[case::an_enum("filteredBooks", parse_quote! { filters: { state: "PUBLISHED" } })] -#[case::variable_in_object("filteredBooks", parse_quote! { filters: { state: $aVariable } })] -#[case::top_level_variable("filteredBooks", parse_quote! { filters: $aVaraible })] -#[case::top_level_variable("filteredBooks", parse_quote! { filters: $aVaraible, optionalFilters: $anotherVar })] -#[case::boolean_scalar("someNullableScalarParams", parse_quote! { aBool: true })] -#[case::missing_parameter("filteredBooks", parse_quote! {})] -#[case::unknown_parameter("someNullableScalarParams", parse_quote! { unknown: "hello" })] -fn test_analyse(#[case] field: &str, #[case] literals: CynicArguments) { +#[case::scalars("scalars", "someScalarParams", parse_quote! { anInt: 1, aFloat: 3, anId: "hello" })] +#[case::missing_nullable_scalars("missing_nullable_scalars", "someNullableScalarParams", parse_quote! { anInt: 1 })] +#[case::empty_nullable_args("empty_nullable_args", "someNullableScalarParams", parse_quote! {})] +#[case::a_list_of_strings("a_list_of_strings", "filteredBooks", parse_quote! { filters: { authors: ["Charles Stross", "Ann Leckie"] } })] +#[case::list_wrapping("list_wrapping", "filteredBooks", parse_quote! { filters: { authors: "Ann Leckie" } })] +#[case::an_enum("an_enum", "filteredBooks", parse_quote! { filters: { state: "PUBLISHED" } })] +#[case::variable_in_object("variable_in_object", "filteredBooks", parse_quote! { filters: { state: $aVariable } })] +#[case::top_level_variable("top_level_variable", "filteredBooks", parse_quote! { filters: $aVaraible })] +#[case::top_level_variables("top_level_variables", "filteredBooks", parse_quote! { filters: $aVaraible, optionalFilters: $anotherVar })] +#[case::boolean_scalar("boolean_scalar", "someNullableScalarParams", parse_quote! { aBool: true })] +#[case::missing_parameter("missing_parameter", "filteredBooks", parse_quote! {})] +#[case::unknown_parameter("unknown_parameter", "someNullableScalarParams", parse_quote! { unknown: "hello" })] +fn test_analyse( + #[case] snapshot_name: &str, + #[case] field: &str, + #[case] literals: CynicArguments, +) { use quote::format_ident; let schema_doc = parse_schema(SCHEMA).unwrap(); @@ -29,13 +33,16 @@ fn test_analyse(#[case] field: &str, #[case] literals: CynicArguments) { let literals = literals.arguments.into_iter().collect::>(); - insta::assert_debug_snapshot!(analyse( - literals, - field, - Some(&format_ident!("MyArguments").into()), - Span::call_site() + insta::assert_debug_snapshot!( + snapshot_name, + analyse( + literals, + field, + Some(&format_ident!("MyArguments").into()), + Span::call_site() + ) + .map(|o| o.arguments) ) - .map(|o| o.arguments)) } #[test] diff --git a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_1.snap b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__argument_and_rename.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_1.snap rename to cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__argument_and_rename.snap index fea94a36..a1c5ef26 100644 --- a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_1.snap +++ b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__argument_and_rename.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/tests.rs -assertion_line: 94 +assertion_line: 114 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::QueryFragment<'de> for MyQuery { diff --git a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_7.snap b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__argument_literals.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_7.snap rename to cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__argument_literals.snap index 2619262f..86c2b240 100644 --- a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_7.snap +++ b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__argument_literals.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/tests.rs -assertion_line: 94 +assertion_line: 114 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::QueryFragment<'de> for MyQuery { diff --git a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_6.snap b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__flatten_attr.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_6.snap rename to cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__flatten_attr.snap index 31f8ab2e..4189b16d 100644 --- a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_6.snap +++ b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__flatten_attr.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/tests.rs -assertion_line: 94 +assertion_line: 114 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::QueryFragment<'de> for Film { diff --git a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_3.snap b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__not_sure.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_3.snap rename to cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__not_sure.snap index 3f55de67..f1553d80 100644 --- a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_3.snap +++ b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__not_sure.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/tests.rs -assertion_line: 94 +assertion_line: 114 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::QueryFragment<'de> for MyQuery { diff --git a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_2.snap b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__simple_struct.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_2.snap rename to cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__simple_struct.snap index a63ead4b..f7e96c72 100644 --- a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_2.snap +++ b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__simple_struct.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/tests.rs -assertion_line: 94 +assertion_line: 114 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::QueryFragment<'de> for BlogPostOutput { diff --git a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_5.snap b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__spread_attr.snap similarity index 98% rename from cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_5.snap rename to cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__spread_attr.snap index d000341f..ef8181c6 100644 --- a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_5.snap +++ b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__spread_attr.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/tests.rs -assertion_line: 85 +assertion_line: 114 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::QueryFragment<'de> for Film { diff --git a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_4.snap b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__variable_in_argument.snap similarity index 99% rename from cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_4.snap rename to cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__variable_in_argument.snap index 2d442e95..9e9062fb 100644 --- a/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__input_4.snap +++ b/cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__variable_in_argument.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/fragment_derive/tests.rs -assertion_line: 94 +assertion_line: 114 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::QueryFragment<'de> for MyQuery { diff --git a/cynic-codegen/src/fragment_derive/tests.rs b/cynic-codegen/src/fragment_derive/tests.rs index 1427bd4d..2a43f427 100644 --- a/cynic-codegen/src/fragment_derive/tests.rs +++ b/cynic-codegen/src/fragment_derive/tests.rs @@ -6,7 +6,9 @@ use syn::parse_quote; use super::fragment_derive; -#[rstest(input => [ +#[rstest] +#[case::argument_and_rename( + "argument_and_rename", parse_quote!( #[cynic( schema_path = "../cynic/tests/test-schema.graphql", @@ -19,7 +21,10 @@ use super::fragment_derive; #[cynic(rename = "allPosts")] posts: Vec, } - ), + ) +)] +#[case::simple_struct( + "simple_struct", parse_quote!( #[cynic( schema_path = "../cynic/tests/test-schema.graphql", @@ -30,7 +35,10 @@ use super::fragment_derive; has_metadata: Option, author: AuthorOutput, } - ), + ) +)] +#[case::not_sure( + "not_sure", parse_quote!( #[cynic( schema_path = "../cynic/tests/test-schema.graphql", @@ -41,7 +49,10 @@ use super::fragment_derive; #[arguments(filters: {states: ["POSTED", "DRAFT"]})] filteredPosts: Vec, } - ), + ) +)] +#[case::variable_in_argument( + "variable_in_argument", parse_quote!( #[cynic( schema_path = "../cynic/tests/test-schema.graphql", @@ -53,7 +64,10 @@ use super::fragment_derive; #[arguments(filters: $filters)] filteredPosts: Vec, } - ), + ) +)] +#[case::spread_attr( + "spread_attr", parse_quote!( #[derive(cynic::QueryFragment, Debug)] #[cynic( @@ -64,7 +78,10 @@ use super::fragment_derive; #[cynic(spread)] details: FilmDetails, } - ), + ) +)] +#[case::flatten_attr( + "flatten_attr", parse_quote!( #[derive(cynic::QueryFragment, Debug)] #[cynic( @@ -75,7 +92,10 @@ use super::fragment_derive; #[cynic(flatten)] producers: Vec, } - ), + ) +)] +#[case::argument_literals( + "argument_literals", parse_quote!( #[cynic( schema_path = "../cynic/tests/test-schema.graphql", @@ -87,11 +107,11 @@ use super::fragment_derive; filteredPosts: Vec, } ), -])] -fn snapshot_fragment_derive(input: syn::DeriveInput) { +)] +fn snapshot_fragment_derive(#[case] snapshot_name: &str, #[case] input: syn::DeriveInput) { let tokens = fragment_derive(&input).unwrap(); - assert_snapshot!(format_code(format!("{}", tokens))); + assert_snapshot!(snapshot_name, format_code(format!("{}", tokens))); } fn format_code(input: String) -> String { diff --git a/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__input_2.snap b/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__interface.snap similarity index 99% rename from cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__input_2.snap rename to cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__interface.snap index ae27b3a4..304a8fc2 100644 --- a/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__input_2.snap +++ b/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__interface.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/inline_fragments_derive/tests.rs -assertion_line: 49 +assertion_line: 55 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::serde::Deserialize<'de> for Node { diff --git a/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__input_1.snap b/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__union_type.snap similarity index 99% rename from cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__input_1.snap rename to cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__union_type.snap index d46a2630..8a67aff0 100644 --- a/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__input_1.snap +++ b/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__union_type.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/inline_fragments_derive/tests.rs -assertion_line: 49 +assertion_line: 55 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::serde::Deserialize<'de> for PostOrAuthor { diff --git a/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__input_3.snap b/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__union_with_rename.snap similarity index 99% rename from cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__input_3.snap rename to cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__union_with_rename.snap index 85a7e11a..dac8ecbf 100644 --- a/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__input_3.snap +++ b/cynic-codegen/src/inline_fragments_derive/snapshots/cynic_codegen__inline_fragments_derive__tests__union_with_rename.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/src/inline_fragments_derive/tests.rs -assertion_line: 49 +assertion_line: 55 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl<'de> ::cynic::serde::Deserialize<'de> for PostOrAuthor { diff --git a/cynic-codegen/src/inline_fragments_derive/tests.rs b/cynic-codegen/src/inline_fragments_derive/tests.rs index 19861a38..44c5dd95 100644 --- a/cynic-codegen/src/inline_fragments_derive/tests.rs +++ b/cynic-codegen/src/inline_fragments_derive/tests.rs @@ -6,8 +6,9 @@ use syn::parse_quote; use super::inline_fragments_derive; -#[rstest(input => [ - // A union type +#[rstest] +#[case::union_type( + "union_type", parse_quote!( #[derive(InlineFragments, Serialize)] #[cynic(schema_path = "../cynic/tests/test-schema.graphql")] @@ -17,8 +18,10 @@ use super::inline_fragments_derive; #[cynic(fallback)] Other } - ), - // An interface + ) +)] +#[case::interface( + "interface", parse_quote!( #[derive(InlineFragments, Serialize)] #[cynic(schema_path = "../cynic/tests/test-schema.graphql")] @@ -30,6 +33,9 @@ use super::inline_fragments_derive; Other } ), +)] +#[case::union_with_rename( + "union_with_rename", // A union that has rename parse_quote!( #[derive(InlineFragments, Serialize)] @@ -41,12 +47,12 @@ use super::inline_fragments_derive; #[cynic(fallback)] Other } - ), -])] -fn snapshot_inline_fragments_derive(input: syn::DeriveInput) { + ) +)] +fn snapshot_inline_fragments_derive(#[case] snapshot_name: &str, #[case] input: syn::DeriveInput) { let tokens = inline_fragments_derive(&input).unwrap(); - assert_snapshot!(format_code(format!("{}", tokens))); + assert_snapshot!(snapshot_name, format_code(format!("{}", tokens))); } fn format_code(input: String) -> String { diff --git a/cynic-codegen/src/input_object_derive/snapshots/cynic_codegen__input_object_derive__tests__input_1.snap b/cynic-codegen/src/input_object_derive/snapshots/cynic_codegen__input_object_derive__tests__snapshot_input_object_derive.snap similarity index 99% rename from cynic-codegen/src/input_object_derive/snapshots/cynic_codegen__input_object_derive__tests__input_1.snap rename to cynic-codegen/src/input_object_derive/snapshots/cynic_codegen__input_object_derive__tests__snapshot_input_object_derive.snap index b8f4f6ad..4301c7dd 100644 --- a/cynic-codegen/src/input_object_derive/snapshots/cynic_codegen__input_object_derive__tests__input_1.snap +++ b/cynic-codegen/src/input_object_derive/snapshots/cynic_codegen__input_object_derive__tests__snapshot_input_object_derive.snap @@ -2,7 +2,6 @@ source: cynic-codegen/src/input_object_derive/tests.rs assertion_line: 24 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl ::cynic::InputObject for IssueOrder { diff --git a/cynic-codegen/src/scalar_derive/snapshots/cynic_codegen__scalar_derive__tests__input_1.snap b/cynic-codegen/src/scalar_derive/snapshots/cynic_codegen__scalar_derive__tests__snapshot_scalar_derive.snap similarity index 99% rename from cynic-codegen/src/scalar_derive/snapshots/cynic_codegen__scalar_derive__tests__input_1.snap rename to cynic-codegen/src/scalar_derive/snapshots/cynic_codegen__scalar_derive__tests__snapshot_scalar_derive.snap index 825d7a25..63ad162d 100644 --- a/cynic-codegen/src/scalar_derive/snapshots/cynic_codegen__scalar_derive__tests__input_1.snap +++ b/cynic-codegen/src/scalar_derive/snapshots/cynic_codegen__scalar_derive__tests__snapshot_scalar_derive.snap @@ -2,7 +2,6 @@ source: cynic-codegen/src/scalar_derive/tests.rs assertion_line: 20 expression: "format_code(format!(\"{}\", tokens))" - --- #[automatically_derived] impl ::cynic::serde::Serialize for DateTime { diff --git a/cynic-codegen/tests/snapshots/use_schema__schema_file_2.snap b/cynic-codegen/tests/snapshots/use_schema__books.graphql.snap similarity index 99% rename from cynic-codegen/tests/snapshots/use_schema__schema_file_2.snap rename to cynic-codegen/tests/snapshots/use_schema__books.graphql.snap index a775e026..cce15a66 100644 --- a/cynic-codegen/tests/snapshots/use_schema__schema_file_2.snap +++ b/cynic-codegen/tests/snapshots/use_schema__books.graphql.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/tests/use-schema.rs -assertion_line: 25 +assertion_line: 30 expression: "format_code(format!(\"{}\", tokens))" - --- impl ::cynic::schema::QueryRoot for QueryRoot {} impl ::cynic::schema::MutationRoot for MutationRoot {} diff --git a/cynic-codegen/tests/snapshots/use_schema__schema_file_1.snap b/cynic-codegen/tests/snapshots/use_schema__graphql.jobs.graphql.snap similarity index 99% rename from cynic-codegen/tests/snapshots/use_schema__schema_file_1.snap rename to cynic-codegen/tests/snapshots/use_schema__graphql.jobs.graphql.snap index 73d40bae..ce4f3487 100644 --- a/cynic-codegen/tests/snapshots/use_schema__schema_file_1.snap +++ b/cynic-codegen/tests/snapshots/use_schema__graphql.jobs.graphql.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/tests/use-schema.rs -assertion_line: 25 +assertion_line: 30 expression: "format_code(format!(\"{}\", tokens))" - --- impl ::cynic::schema::QueryRoot for Query {} impl ::cynic::schema::MutationRoot for Mutation {} diff --git a/cynic-codegen/tests/snapshots/use_schema__schema_file_5.snap b/cynic-codegen/tests/snapshots/use_schema__simple.graphql.snap similarity index 99% rename from cynic-codegen/tests/snapshots/use_schema__schema_file_5.snap rename to cynic-codegen/tests/snapshots/use_schema__simple.graphql.snap index e8fbc2d1..5bc36ed2 100644 --- a/cynic-codegen/tests/snapshots/use_schema__schema_file_5.snap +++ b/cynic-codegen/tests/snapshots/use_schema__simple.graphql.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/tests/use-schema.rs -assertion_line: 25 +assertion_line: 30 expression: "format_code(format!(\"{}\", tokens))" - --- impl ::cynic::schema::QueryRoot for Query {} pub struct AnInputType; diff --git a/cynic-codegen/tests/snapshots/use_schema__schema_file_3.snap b/cynic-codegen/tests/snapshots/use_schema__starwars.schema.graphql.snap similarity index 99% rename from cynic-codegen/tests/snapshots/use_schema__schema_file_3.snap rename to cynic-codegen/tests/snapshots/use_schema__starwars.schema.graphql.snap index e1f5d8c2..d881b7b0 100644 --- a/cynic-codegen/tests/snapshots/use_schema__schema_file_3.snap +++ b/cynic-codegen/tests/snapshots/use_schema__starwars.schema.graphql.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/tests/use-schema.rs -assertion_line: 25 +assertion_line: 30 expression: "format_code(format!(\"{}\", tokens))" - --- impl ::cynic::schema::QueryRoot for Root {} pub struct Film; diff --git a/cynic-codegen/tests/snapshots/use_schema__schema_file_4.snap b/cynic-codegen/tests/snapshots/use_schema__test_cases.graphql.snap similarity index 99% rename from cynic-codegen/tests/snapshots/use_schema__schema_file_4.snap rename to cynic-codegen/tests/snapshots/use_schema__test_cases.graphql.snap index 1ddc9703..572abd44 100644 --- a/cynic-codegen/tests/snapshots/use_schema__schema_file_4.snap +++ b/cynic-codegen/tests/snapshots/use_schema__test_cases.graphql.snap @@ -1,8 +1,7 @@ --- source: cynic-codegen/tests/use-schema.rs -assertion_line: 25 +assertion_line: 30 expression: "format_code(format!(\"{}\", tokens))" - --- impl ::cynic::schema::QueryRoot for Foo {} pub struct Bar; diff --git a/cynic-codegen/tests/use-schema.rs b/cynic-codegen/tests/use-schema.rs index ddd47c46..8beccdeb 100644 --- a/cynic-codegen/tests/use-schema.rs +++ b/cynic-codegen/tests/use-schema.rs @@ -22,7 +22,12 @@ fn snapshot_use_schema_two(schema_file: &str) { }) .unwrap(); - assert_snapshot!(format_code(format!("{}", tokens))); + let snapshot_name = std::path::Path::new(schema_file) + .file_name() + .and_then(|s| s.to_str()) + .unwrap(); + + assert_snapshot!(snapshot_name, format_code(format!("{}", tokens))); } fn format_code(input: String) -> String { diff --git a/cynic-querygen/Cargo.toml b/cynic-querygen/Cargo.toml index c9e528a6..6f10ca51 100644 --- a/cynic-querygen/Cargo.toml +++ b/cynic-querygen/Cargo.toml @@ -20,5 +20,5 @@ once_cell = "1.9" [dev-dependencies] assert_matches = "1.4" -insta = "1.9.0" +insta = "1.17.1" rstest = "0.11" diff --git a/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_fragment_spread_output.snap b/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_fragment_spread_output.snap index 0861aeac..e94d76e2 100644 --- a/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_fragment_spread_output.snap +++ b/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_fragment_spread_output.snap @@ -1,5 +1,6 @@ --- source: cynic-querygen/src/query_parsing/normalisation.rs +assertion_line: 700 expression: film_selections.get(0).unwrap().selections --- [ diff --git a/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_inline_fragment_output.snap b/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_inline_fragment_output.snap index 0861aeac..d66f3430 100644 --- a/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_inline_fragment_output.snap +++ b/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_inline_fragment_output.snap @@ -1,5 +1,6 @@ --- source: cynic-querygen/src/query_parsing/normalisation.rs +assertion_line: 815 expression: film_selections.get(0).unwrap().selections --- [ diff --git a/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_output_makes_sense.snap b/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_output_makes_sense.snap index b479ba1c..b34b95e5 100644 --- a/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_output_makes_sense.snap +++ b/cynic-querygen/src/query_parsing/snapshots/cynic_querygen__query_parsing__normalisation__tests__check_output_makes_sense.snap @@ -1,7 +1,7 @@ --- source: cynic-querygen/src/query_parsing/normalisation.rs +assertion_line: 663 expression: normalised - --- NormalisedDocument { selection_sets: { diff --git a/cynic-querygen/tests/snapshots/github_tests__add_comment_mutation.snap b/cynic-querygen/tests/snapshots/github_tests__add_comment_mutation.snap index 38b3ece3..b40ef6e0 100644 --- a/cynic-querygen/tests/snapshots/github_tests__add_comment_mutation.snap +++ b/cynic-querygen/tests/snapshots/github_tests__add_comment_mutation.snap @@ -2,7 +2,6 @@ source: cynic-querygen/tests/github-tests.rs assertion_line: 25 expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/github_tests__field_on_interface.snap b/cynic-querygen/tests/snapshots/github_tests__field_on_interface.snap index 769fab8c..a188f810 100644 --- a/cynic-querygen/tests/snapshots/github_tests__field_on_interface.snap +++ b/cynic-querygen/tests/snapshots/github_tests__field_on_interface.snap @@ -2,7 +2,6 @@ source: cynic-querygen/tests/github-tests.rs assertion_line: 31 expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/github_tests__inline_fragment_on_union.snap b/cynic-querygen/tests/snapshots/github_tests__inline_fragment_on_union.snap index 5a3c0c18..3bf73ce7 100644 --- a/cynic-querygen/tests/snapshots/github_tests__inline_fragment_on_union.snap +++ b/cynic-querygen/tests/snapshots/github_tests__inline_fragment_on_union.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/github-tests.rs assertion_line: 26 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/github_tests__inline_fragment_with_arguments.snap b/cynic-querygen/tests/snapshots/github_tests__inline_fragment_with_arguments.snap index 4e82b763..66b032c0 100644 --- a/cynic-querygen/tests/snapshots/github_tests__inline_fragment_with_arguments.snap +++ b/cynic-querygen/tests/snapshots/github_tests__inline_fragment_with_arguments.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/github-tests.rs assertion_line: 27 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/github_tests__input_object_arguments.snap b/cynic-querygen/tests/snapshots/github_tests__input_object_arguments.snap index e6228078..a6a09e1e 100644 --- a/cynic-querygen/tests/snapshots/github_tests__input_object_arguments.snap +++ b/cynic-querygen/tests/snapshots/github_tests__input_object_arguments.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/github-tests.rs assertion_line: 24 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/github_tests__input_object_literals.snap b/cynic-querygen/tests/snapshots/github_tests__input_object_literals.snap index 8fa903f2..1b7031aa 100644 --- a/cynic-querygen/tests/snapshots/github_tests__input_object_literals.snap +++ b/cynic-querygen/tests/snapshots/github_tests__input_object_literals.snap @@ -2,7 +2,6 @@ source: cynic-querygen/tests/github-tests.rs assertion_line: 23 expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/github_tests__literal_enums.snap b/cynic-querygen/tests/snapshots/github_tests__literal_enums.snap index a5c0944b..905e47ef 100644 --- a/cynic-querygen/tests/snapshots/github_tests__literal_enums.snap +++ b/cynic-querygen/tests/snapshots/github_tests__literal_enums.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/github-tests.rs assertion_line: 22 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/misc_tests__book_subscription_test.snap b/cynic-querygen/tests/snapshots/misc_tests__book_subscription_test.snap index 5c82ed0d..86598463 100644 --- a/cynic-querygen/tests/snapshots/misc_tests__book_subscription_test.snap +++ b/cynic-querygen/tests/snapshots/misc_tests__book_subscription_test.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/misc-tests.rs assertion_line: 21 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/misc_tests__keyword_renames.snap b/cynic-querygen/tests/snapshots/misc_tests__keyword_renames.snap index 4c01bd26..cb40dafa 100644 --- a/cynic-querygen/tests/snapshots/misc_tests__keyword_renames.snap +++ b/cynic-querygen/tests/snapshots/misc_tests__keyword_renames.snap @@ -1,7 +1,7 @@ --- source: cynic-querygen/tests/misc-tests.rs -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +assertion_line: 32 +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/misc_tests__mutation_with_scalar_result_and_input.snap b/cynic-querygen/tests/snapshots/misc_tests__mutation_with_scalar_result_and_input.snap index a3d7a158..2e999ad4 100644 --- a/cynic-querygen/tests/snapshots/misc_tests__mutation_with_scalar_result_and_input.snap +++ b/cynic-querygen/tests/snapshots/misc_tests__mutation_with_scalar_result_and_input.snap @@ -2,7 +2,6 @@ source: cynic-querygen/tests/misc-tests.rs assertion_line: 10 expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/misc_tests__scalar_casing.snap b/cynic-querygen/tests/snapshots/misc_tests__scalar_casing.snap index 4e43c138..bbc15a53 100644 --- a/cynic-querygen/tests/snapshots/misc_tests__scalar_casing.snap +++ b/cynic-querygen/tests/snapshots/misc_tests__scalar_casing.snap @@ -2,7 +2,6 @@ source: cynic-querygen/tests/misc-tests.rs assertion_line: 43 expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/starwars_tests__aliases.snap b/cynic-querygen/tests/snapshots/starwars_tests__aliases.snap index 0f370aa7..e360149d 100644 --- a/cynic-querygen/tests/snapshots/starwars_tests__aliases.snap +++ b/cynic-querygen/tests/snapshots/starwars_tests__aliases.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/starwars-tests.rs assertion_line: 27 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/starwars_tests__bare_selection_sets.snap b/cynic-querygen/tests/snapshots/starwars_tests__bare_selection_sets.snap index fbe83e6a..c8998caa 100644 --- a/cynic-querygen/tests/snapshots/starwars_tests__bare_selection_sets.snap +++ b/cynic-querygen/tests/snapshots/starwars_tests__bare_selection_sets.snap @@ -1,6 +1,7 @@ --- source: cynic-querygen/tests/starwars-tests.rs -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" +assertion_line: 24 +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/starwars_tests__float.snap b/cynic-querygen/tests/snapshots/starwars_tests__float.snap index f227e014..aed52cd3 100644 --- a/cynic-querygen/tests/snapshots/starwars_tests__float.snap +++ b/cynic-querygen/tests/snapshots/starwars_tests__float.snap @@ -1,7 +1,7 @@ --- source: cynic-querygen/tests/starwars-tests.rs -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +assertion_line: 28 +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/starwars_tests__fragment_spreads.snap b/cynic-querygen/tests/snapshots/starwars_tests__fragment_spreads.snap index 60431b6f..ac414e75 100644 --- a/cynic-querygen/tests/snapshots/starwars_tests__fragment_spreads.snap +++ b/cynic-querygen/tests/snapshots/starwars_tests__fragment_spreads.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/starwars-tests.rs assertion_line: 26 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/starwars_tests__multiple_queries.snap b/cynic-querygen/tests/snapshots/starwars_tests__multiple_queries.snap index d024cd4c..af2bbf85 100644 --- a/cynic-querygen/tests/snapshots/starwars_tests__multiple_queries.snap +++ b/cynic-querygen/tests/snapshots/starwars_tests__multiple_queries.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/starwars-tests.rs assertion_line: 25 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/starwars_tests__nested_arguments.snap b/cynic-querygen/tests/snapshots/starwars_tests__nested_arguments.snap index ec71ec08..0cd05461 100644 --- a/cynic-querygen/tests/snapshots/starwars_tests__nested_arguments.snap +++ b/cynic-querygen/tests/snapshots/starwars_tests__nested_arguments.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/starwars-tests.rs assertion_line: 23 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic-querygen/tests/snapshots/starwars_tests__sanity_test_starwars_query.snap b/cynic-querygen/tests/snapshots/starwars_tests__sanity_test_starwars_query.snap index 23752288..3f18a3fb 100644 --- a/cynic-querygen/tests/snapshots/starwars_tests__sanity_test_starwars_query.snap +++ b/cynic-querygen/tests/snapshots/starwars_tests__sanity_test_starwars_query.snap @@ -1,8 +1,7 @@ --- source: cynic-querygen/tests/starwars-tests.rs assertion_line: 22 -expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" - +expression: "document_to_fragment_structs(query, schema,\n &QueryGenOptions::default()).expect(\"QueryGen Failed\")" --- #[cynic::schema_for_derives( file = r#"schema.graphql"#, diff --git a/cynic/Cargo.toml b/cynic/Cargo.toml index d4a0cc3f..3ec44b2f 100644 --- a/cynic/Cargo.toml +++ b/cynic/Cargo.toml @@ -36,7 +36,7 @@ reqwest = { version = "0.11", optional = true, features = ["json"], default-feat [dev-dependencies] assert_matches = "1.4" chrono = { version = "0.4.19", features = ["serde"] } -insta = "1.9" +insta = "1.17" maplit = "1.0.2" rstest = "0.12.0" serde_json = { version = "1.0" } diff --git a/cynic/tests/snapshots/keyword_queries__query_decoding.snap b/cynic/tests/snapshots/keyword_queries__query_decoding.snap index 59152464..5583cbaa 100644 --- a/cynic/tests/snapshots/keyword_queries__query_decoding.snap +++ b/cynic/tests/snapshots/keyword_queries__query_decoding.snap @@ -2,7 +2,6 @@ source: cynic/tests/keyword-queries.rs assertion_line: 26 expression: data - --- whatevs: false whatevs2: false diff --git a/cynic/tests/snapshots/keyword_queries__query_output.snap b/cynic/tests/snapshots/keyword_queries__query_output.snap index 5b8173de..16dee6d6 100644 --- a/cynic/tests/snapshots/keyword_queries__query_output.snap +++ b/cynic/tests/snapshots/keyword_queries__query_output.snap @@ -2,7 +2,6 @@ source: cynic/tests/keyword-queries.rs assertion_line: 11 expression: query.query - --- query { _ diff --git a/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_decoding_with_less_depth.snap b/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_decoding_with_less_depth.snap index 7f0d4572..355d607c 100644 --- a/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_decoding_with_less_depth.snap +++ b/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_decoding_with_less_depth.snap @@ -1,8 +1,7 @@ --- source: cynic/tests/recursive-queries.rs -assertion_line: 129 +assertion_line: 117 expression: "serde_json::from_value::(data).unwrap()" - --- all_authors: - friends: diff --git a/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_decoding_with_matching_depth.snap b/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_decoding_with_matching_depth.snap index 28c394af..0a35693c 100644 --- a/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_decoding_with_matching_depth.snap +++ b/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_decoding_with_matching_depth.snap @@ -1,8 +1,7 @@ --- source: cynic/tests/recursive-queries.rs -assertion_line: 120 +assertion_line: 108 expression: "serde_json::from_value::(data).unwrap()" - --- all_authors: - friends: diff --git a/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_query_output.snap b/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_query_output.snap index a8ea7c51..94d7fb7f 100644 --- a/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_query_output.snap +++ b/cynic/tests/snapshots/recursive_queries__optional_recursive_types__friends_query_output.snap @@ -1,8 +1,7 @@ --- source: cynic/tests/recursive-queries.rs -assertion_line: 102 +assertion_line: 90 expression: operation.query - --- query { allAuthors { diff --git a/cynic/tests/snapshots/recursive_queries__recursive_lists__all_posts_query_output.snap b/cynic/tests/snapshots/recursive_queries__recursive_lists__all_posts_query_output.snap index 893273d6..beb0a9a2 100644 --- a/cynic/tests/snapshots/recursive_queries__recursive_lists__all_posts_query_output.snap +++ b/cynic/tests/snapshots/recursive_queries__recursive_lists__all_posts_query_output.snap @@ -1,8 +1,7 @@ --- source: cynic/tests/recursive-queries.rs -assertion_line: 50 +assertion_line: 42 expression: operation.query - --- query { allPosts { diff --git a/cynic/tests/snapshots/recursive_queries__recursive_lists__decoding_with_matching_depth.snap b/cynic/tests/snapshots/recursive_queries__recursive_lists__decoding_with_matching_depth.snap index a43289f3..790a72b2 100644 --- a/cynic/tests/snapshots/recursive_queries__recursive_lists__decoding_with_matching_depth.snap +++ b/cynic/tests/snapshots/recursive_queries__recursive_lists__decoding_with_matching_depth.snap @@ -1,8 +1,7 @@ --- source: cynic/tests/recursive-queries.rs -assertion_line: 57 +assertion_line: 49 expression: "serde_json::from_value::(data).unwrap()" - --- all_posts: - comments: diff --git a/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_decoding_with_less_depth.snap b/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_decoding_with_less_depth.snap index 35dce59f..58f20fa2 100644 --- a/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_decoding_with_less_depth.snap +++ b/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_decoding_with_less_depth.snap @@ -1,8 +1,7 @@ --- source: cynic/tests/recursive-queries.rs -assertion_line: 196 +assertion_line: 180 expression: "serde_json::from_value::(data).unwrap()" - --- all_authors: - me: diff --git a/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_decoding_with_matching_depth.snap b/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_decoding_with_matching_depth.snap index 9d303581..18001095 100644 --- a/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_decoding_with_matching_depth.snap +++ b/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_decoding_with_matching_depth.snap @@ -1,8 +1,7 @@ --- source: cynic/tests/recursive-queries.rs -assertion_line: 187 +assertion_line: 171 expression: "serde_json::from_value::(data).unwrap()" - --- all_authors: - me: diff --git a/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_query_output.snap b/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_query_output.snap index ad9d69bf..78f9e8fb 100644 --- a/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_query_output.snap +++ b/cynic/tests/snapshots/recursive_queries__required_recursive_types__friends_query_output.snap @@ -1,8 +1,7 @@ --- source: cynic/tests/recursive-queries.rs -assertion_line: 174 +assertion_line: 158 expression: operation.query - --- query { allAuthors { diff --git a/cynic/tests/snapshots/renames__all_posts_query_output.snap b/cynic/tests/snapshots/renames__all_posts_query_output.snap index 7ef07ace..84d590f3 100644 --- a/cynic/tests/snapshots/renames__all_posts_query_output.snap +++ b/cynic/tests/snapshots/renames__all_posts_query_output.snap @@ -1,7 +1,7 @@ --- source: cynic/tests/renames.rs -expression: query.query - +assertion_line: 53 +expression: operation.query --- query { allPosts { diff --git a/cynic/tests/snapshots/renames__decoding.snap b/cynic/tests/snapshots/renames__decoding.snap index 0c03f517..1524c9fe 100644 --- a/cynic/tests/snapshots/renames__decoding.snap +++ b/cynic/tests/snapshots/renames__decoding.snap @@ -1,7 +1,7 @@ --- source: cynic/tests/renames.rs -expression: query.decode_response(data).unwrap().data - +assertion_line: 68 +expression: "serde_json::from_value::>(data).unwrap().data" --- all_posts: - metadata_present: true diff --git a/cynic/tests/snapshots/simple_schema_tests__query_building.snap b/cynic/tests/snapshots/simple_schema_tests__query_building.snap index 90104f20..52012ec8 100644 --- a/cynic/tests/snapshots/simple_schema_tests__query_building.snap +++ b/cynic/tests/snapshots/simple_schema_tests__query_building.snap @@ -2,7 +2,6 @@ source: cynic/tests/simple_schema_tests.rs assertion_line: 100 expression: operation.query - --- query($anInt: Int!) { testStruct { diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 636d6af2..441c89f7 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -25,4 +25,4 @@ chrono = { version = "0.4", features = ["serde"] } github-schema = { path = "../schemas/github" } [dev-dependencies] -insta = "1.9" +insta = "1.17" diff --git a/examples/examples/snapshots/chrono_scalars__test__running_query.snap b/examples/examples/snapshots/chrono_scalars__test__running_query.snap index 543a49f5..8daa0648 100644 --- a/examples/examples/snapshots/chrono_scalars__test__running_query.snap +++ b/examples/examples/snapshots/chrono_scalars__test__running_query.snap @@ -1,5 +1,6 @@ --- source: examples/examples/chrono-scalars.rs +assertion_line: 71 expression: result.data --- Some( diff --git a/examples/examples/snapshots/chrono_scalars__test__snapshot_test_query.snap b/examples/examples/snapshots/chrono_scalars__test__snapshot_test_query.snap index 92be2fd3..cc90688f 100644 --- a/examples/examples/snapshots/chrono_scalars__test__snapshot_test_query.snap +++ b/examples/examples/snapshots/chrono_scalars__test__snapshot_test_query.snap @@ -1,8 +1,7 @@ --- source: examples/examples/chrono-scalars.rs -assertion_line: 63 +assertion_line: 62 expression: query.query - --- query { jobs { diff --git a/examples/examples/snapshots/github__test__running_query.snap b/examples/examples/snapshots/github__test__running_query.snap deleted file mode 100644 index c630438e..00000000 --- a/examples/examples/snapshots/github__test__running_query.snap +++ /dev/null @@ -1,56 +0,0 @@ ---- -source: examples/examples/github.rs -expression: result.data ---- -Some( - PullRequestTitles { - repository: Some( - Repository { - pull_requests: PullRequestConnection { - nodes: [ - PullRequest { - title: "Add CI using Github Actions", - created_at: 2020-02-07T17:55:27Z, - }, - PullRequest { - title: "Simple type validation in QueryFragment derive.", - created_at: 2020-02-09T16:12:21Z, - }, - PullRequest { - title: "Add support for union types via InlineFragments trait.", - created_at: 2020-02-09T16:26:06Z, - }, - PullRequest { - title: "Add scalars_as_strings.", - created_at: 2020-02-18T21:00:57Z, - }, - PullRequest { - title: "Convert parsing of derive input to use darling", - created_at: 2020-02-23T19:42:14Z, - }, - PullRequest { - title: "Fix cynic_arguments parsing with darling", - created_at: 2020-02-23T21:23:34Z, - }, - PullRequest { - title: "Added `flatten` option at the field level.", - created_at: 2020-02-23T22:03:07Z, - }, - PullRequest { - title: "Optimisations", - created_at: 2020-03-28T14:05:36Z, - }, - PullRequest { - title: "First attempt at querygen & web interface", - created_at: 2020-05-23T09:58:12Z, - }, - PullRequest { - title: "Added query_module attribute macro.", - created_at: 2020-05-24T14:19:59Z, - }, - ], - }, - }, - ), - }, -) diff --git a/examples/examples/snapshots/github__test__snapshot_test_query.snap b/examples/examples/snapshots/github__test__snapshot_test_query.snap index af22c318..3ae7e562 100644 --- a/examples/examples/snapshots/github__test__snapshot_test_query.snap +++ b/examples/examples/snapshots/github__test__snapshot_test_query.snap @@ -2,7 +2,6 @@ source: examples/examples/github.rs assertion_line: 121 expression: query.query - --- query($prOrder: IssueOrder!) { repository(name: "cynic", owner: "obmarg") { diff --git a/examples/examples/snapshots/github_mutation__test__snapshot_test_query.snap b/examples/examples/snapshots/github_mutation__test__snapshot_test_query.snap index 59d39083..c1e1b951 100644 --- a/examples/examples/snapshots/github_mutation__test__snapshot_test_query.snap +++ b/examples/examples/snapshots/github_mutation__test__snapshot_test_query.snap @@ -2,7 +2,6 @@ source: examples/examples/github-mutation.rs assertion_line: 105 expression: query.query - --- mutation($commentBody: String!) { addComment(input: {body: $commentBody, subjectId: "MDU6SXNzdWU2ODU4NzUxMzQ=", clientMutationId: null, }) { diff --git a/examples/examples/snapshots/manual_reqwest__test__running_query.snap b/examples/examples/snapshots/manual_reqwest__test__running_query.snap index ce493baa..446588d3 100644 --- a/examples/examples/snapshots/manual_reqwest__test__running_query.snap +++ b/examples/examples/snapshots/manual_reqwest__test__running_query.snap @@ -1,5 +1,6 @@ --- source: examples/examples/manual-reqwest.rs +assertion_line: 83 expression: result.data --- Some( diff --git a/examples/examples/snapshots/manual_reqwest__test__snapshot_test_query.snap b/examples/examples/snapshots/manual_reqwest__test__snapshot_test_query.snap index 111628dc..854d6e41 100644 --- a/examples/examples/snapshots/manual_reqwest__test__snapshot_test_query.snap +++ b/examples/examples/snapshots/manual_reqwest__test__snapshot_test_query.snap @@ -1,8 +1,7 @@ --- source: examples/examples/manual-reqwest.rs -assertion_line: 73 +assertion_line: 74 expression: query.query - --- query($id: ID) { film(id: $id) { diff --git a/examples/examples/snapshots/querying_interfaces__test__running_query_with_film.snap b/examples/examples/snapshots/querying_interfaces__test__running_query_with_film.snap index 80792bb2..f35efa0a 100644 --- a/examples/examples/snapshots/querying_interfaces__test__running_query_with_film.snap +++ b/examples/examples/snapshots/querying_interfaces__test__running_query_with_film.snap @@ -1,8 +1,7 @@ --- source: examples/examples/querying-interfaces.rs -assertion_line: 124 +assertion_line: 115 expression: result.data - --- Some( Query { diff --git a/examples/examples/snapshots/querying_interfaces__test__running_query_with_planet.snap b/examples/examples/snapshots/querying_interfaces__test__running_query_with_planet.snap index 1f09b564..03f55288 100644 --- a/examples/examples/snapshots/querying_interfaces__test__running_query_with_planet.snap +++ b/examples/examples/snapshots/querying_interfaces__test__running_query_with_planet.snap @@ -1,8 +1,7 @@ --- source: examples/examples/querying-interfaces.rs -assertion_line: 133 +assertion_line: 124 expression: result.data - --- Some( Query { diff --git a/examples/examples/snapshots/querying_interfaces__test__running_query_with_starship.snap b/examples/examples/snapshots/querying_interfaces__test__running_query_with_starship.snap index 16dffb20..2cde092e 100644 --- a/examples/examples/snapshots/querying_interfaces__test__running_query_with_starship.snap +++ b/examples/examples/snapshots/querying_interfaces__test__running_query_with_starship.snap @@ -1,8 +1,7 @@ --- source: examples/examples/querying-interfaces.rs -assertion_line: 142 +assertion_line: 133 expression: result.data - --- Some( Query { diff --git a/examples/examples/snapshots/querying_interfaces__test__snapshot_test_query.snap b/examples/examples/snapshots/querying_interfaces__test__snapshot_test_query.snap index 09543306..b3d3da9e 100644 --- a/examples/examples/snapshots/querying_interfaces__test__snapshot_test_query.snap +++ b/examples/examples/snapshots/querying_interfaces__test__snapshot_test_query.snap @@ -1,8 +1,7 @@ --- source: examples/examples/querying-interfaces.rs -assertion_line: 115 +assertion_line: 106 expression: query.query - --- query($id: ID!) { node(id: $id) { diff --git a/examples/examples/snapshots/reqwest_async__test__running_query.snap b/examples/examples/snapshots/reqwest_async__test__running_query.snap index c6293861..8fe77bdd 100644 --- a/examples/examples/snapshots/reqwest_async__test__running_query.snap +++ b/examples/examples/snapshots/reqwest_async__test__running_query.snap @@ -1,5 +1,6 @@ --- source: examples/examples/reqwest-async.rs +assertion_line: 86 expression: result.data --- Some( diff --git a/examples/examples/snapshots/reqwest_async__test__snapshot_test_query.snap b/examples/examples/snapshots/reqwest_async__test__snapshot_test_query.snap index 161e98f7..4f5f9154 100644 --- a/examples/examples/snapshots/reqwest_async__test__snapshot_test_query.snap +++ b/examples/examples/snapshots/reqwest_async__test__snapshot_test_query.snap @@ -1,8 +1,7 @@ --- source: examples/examples/reqwest-async.rs -assertion_line: 74 +assertion_line: 77 expression: query.query - --- query($id: ID) { film(id: $id) { diff --git a/examples/examples/snapshots/spread__test__running_query.snap b/examples/examples/snapshots/spread__test__running_query.snap index 835144f5..57d4f7dd 100644 --- a/examples/examples/snapshots/spread__test__running_query.snap +++ b/examples/examples/snapshots/spread__test__running_query.snap @@ -1,7 +1,7 @@ --- source: examples/examples/spread.rs +assertion_line: 94 expression: result.data - --- Some( FilmDirectorQuery { diff --git a/examples/examples/snapshots/spread__test__snapshot_test_query.snap b/examples/examples/snapshots/spread__test__snapshot_test_query.snap index e5a64647..a034a81c 100644 --- a/examples/examples/snapshots/spread__test__snapshot_test_query.snap +++ b/examples/examples/snapshots/spread__test__snapshot_test_query.snap @@ -1,8 +1,7 @@ --- source: examples/examples/spread.rs -assertion_line: 82 +assertion_line: 85 expression: query.query - --- query($id: ID) { film(id: $id) { diff --git a/examples/examples/snapshots/starwars__test__running_query.snap b/examples/examples/snapshots/starwars__test__running_query.snap index 0599c166..325c3de0 100644 --- a/examples/examples/snapshots/starwars__test__running_query.snap +++ b/examples/examples/snapshots/starwars__test__running_query.snap @@ -1,5 +1,6 @@ --- source: examples/examples/starwars.rs +assertion_line: 81 expression: result.data --- Some( diff --git a/examples/examples/snapshots/starwars__test__snapshot_test_query.snap b/examples/examples/snapshots/starwars__test__snapshot_test_query.snap index 28a4b4bc..fb8be407 100644 --- a/examples/examples/snapshots/starwars__test__snapshot_test_query.snap +++ b/examples/examples/snapshots/starwars__test__snapshot_test_query.snap @@ -1,8 +1,7 @@ --- source: examples/examples/starwars.rs -assertion_line: 69 +assertion_line: 72 expression: query.query - --- query($id: ID) { film(id: $id) { diff --git a/examples/examples/snapshots/surf_client__test__running_query.snap b/examples/examples/snapshots/surf_client__test__running_query.snap index 03c1d535..86c92590 100644 --- a/examples/examples/snapshots/surf_client__test__running_query.snap +++ b/examples/examples/snapshots/surf_client__test__running_query.snap @@ -1,5 +1,6 @@ --- source: examples/examples/surf-client.rs +assertion_line: 87 expression: result.data --- Some( diff --git a/examples/examples/snapshots/surf_client__test__snapshot_test_query.snap b/examples/examples/snapshots/surf_client__test__snapshot_test_query.snap index 1dafbd9c..222f29f4 100644 --- a/examples/examples/snapshots/surf_client__test__snapshot_test_query.snap +++ b/examples/examples/snapshots/surf_client__test__snapshot_test_query.snap @@ -1,8 +1,7 @@ --- source: examples/examples/surf-client.rs -assertion_line: 74 +assertion_line: 77 expression: query.query - --- query($id: ID) { film(id: $id) {