From 1f442da0412557e968511a9b70f47da588f4d6b7 Mon Sep 17 00:00:00 2001 From: Ben Kraft Date: Thu, 3 Jun 2021 12:08:09 -0700 Subject: [PATCH] Switch to cupaloy for snapshots Slightly uglier filenames, but less code and free diffing! Approved in ADR-466 for Khan use. Fixes #23. --- generate/generate_test.go | 60 +++---------------- generate/parse_test.go | 1 + generate/testdata/errors/NoQuery.go.error | 1 - .../testdata/errors/NoQuery.graphql.error | 1 - ...rate-DateTime.graphql-DateTime.graphql.go} | 1 + ...te-DateTime.graphql-DateTime.graphql.json} | 2 +- ...terface.graphql-EmptyInterface.graphql.go} | 1 + ...rface.graphql-EmptyInterface.graphql.json} | 2 +- ...te-InputEnum.graphql-InputEnum.graphql.go} | 1 + ...-InputEnum.graphql-InputEnum.graphql.json} | 2 +- ...nputObject.graphql-InputObject.graphql.go} | 1 + ...utObject.graphql-InputObject.graphql.json} | 2 +- ...sting.graphql-InterfaceNesting.graphql.go} | 1 + ...ing.graphql-InterfaceNesting.graphql.json} | 2 +- ...s.graphql-InterfaceNoFragments.graphql.go} | 1 + ...graphql-InterfaceNoFragments.graphql.json} | 2 +- ...te-ListInput.graphql-ListInput.graphql.go} | 1 + ...-ListInput.graphql-ListInput.graphql.json} | 2 +- ...sts.graphql-ListOfListsOfLists.graphql.go} | 1 + ...s.graphql-ListOfListsOfLists.graphql.json} | 2 +- ...te-Omitempty.graphql-Omitempty.graphql.go} | 1 + ...-Omitempty.graphql-Omitempty.graphql.json} | 2 +- ...rate-Pointers.graphql-Pointers.graphql.go} | 1 + ...te-Pointers.graphql-Pointers.graphql.json} | 2 +- ...sInline.graphql-PointersInline.graphql.go} | 1 + ...nline.graphql-PointersInline.graphql.json} | 2 +- ...thAlias.graphql-QueryWithAlias.graphql.go} | 1 + ...Alias.graphql-QueryWithAlias.graphql.json} | 2 +- ...s.graphql-QueryWithDoubleAlias.graphql.go} | 1 + ...graphql-QueryWithDoubleAlias.graphql.json} | 2 +- ...thEnums.graphql-QueryWithEnums.graphql.go} | 1 + ...Enums.graphql-QueryWithEnums.graphql.json} | 2 +- ...Slices.graphql-QueryWithSlices.graphql.go} | 1 + ...ices.graphql-QueryWithSlices.graphql.json} | 2 +- ...ructs.graphql-QueryWithStructs.graphql.go} | 1 + ...cts.graphql-QueryWithStructs.graphql.json} | 2 +- ...impleInput.graphql-SimpleInput.graphql.go} | 1 + ...pleInput.graphql-SimpleInput.graphql.json} | 2 +- ...utation.graphql-SimpleMutation.graphql.go} | 1 + ...ation.graphql-SimpleMutation.graphql.json} | 2 +- ...impleQuery.graphql-SimpleQuery.graphql.go} | 1 + ...pleQuery.graphql-SimpleQuery.graphql.json} | 2 +- ...rate-TypeName.graphql-TypeName.graphql.go} | 1 + ...te-TypeName.graphql-TypeName.graphql.json} | 2 +- ...ments.graphql-UnionNoFragments.graphql.go} | 1 + ...nts.graphql-UnionNoFragments.graphql.json} | 2 +- ...numTwice.graphql-UsesEnumTwice.graphql.go} | 1 + ...mTwice.graphql-UsesEnumTwice.graphql.json} | 2 +- ...-unexported.graphql-unexported.graphql.go} | 1 + ...nexported.graphql-unexported.graphql.json} | 2 +- .../TestGenerateErrors-InvalidQuery.go} | 2 +- .../TestGenerateErrors-InvalidQuery.graphql} | 2 +- .../TestGenerateErrors-InvalidScalar.go} | 2 +- .../TestGenerateErrors-InvalidScalar.graphql} | 2 +- .../TestGenerateErrors-InvalidSchema.go} | 2 +- .../TestGenerateErrors-InvalidSchema.graphql} | 2 +- .../snapshots/TestGenerateErrors-NoQuery.go | 1 + .../TestGenerateErrors-NoQuery.graphql | 1 + .../TestGenerateErrors-UnknownScalar.go} | 2 +- .../TestGenerateErrors-UnknownScalar.graphql} | 2 +- go.mod | 1 + go.sum | 7 +++ internal/testutil/cupaloy.go | 5 ++ 63 files changed, 78 insertions(+), 85 deletions(-) delete mode 100644 generate/testdata/errors/NoQuery.go.error delete mode 100644 generate/testdata/errors/NoQuery.graphql.error rename generate/testdata/{queries/DateTime.graphql.go => snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.go} (99%) rename generate/testdata/{queries/DateTime.graphql.json => snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.json} (99%) rename generate/testdata/{queries/EmptyInterface.graphql.go => snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.go} (99%) rename generate/testdata/{queries/EmptyInterface.graphql.json => snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.json} (99%) rename generate/testdata/{queries/InputEnum.graphql.go => snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.go} (99%) rename generate/testdata/{queries/InputEnum.graphql.json => snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.json} (99%) rename generate/testdata/{queries/InputObject.graphql.go => snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.go} (99%) rename generate/testdata/{queries/InputObject.graphql.json => snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.json} (99%) rename generate/testdata/{queries/InterfaceNesting.graphql.go => snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.go} (99%) rename generate/testdata/{queries/InterfaceNesting.graphql.json => snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.json} (99%) rename generate/testdata/{queries/InterfaceNoFragments.graphql.go => snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.go} (99%) rename generate/testdata/{queries/InterfaceNoFragments.graphql.json => snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.json} (99%) rename generate/testdata/{queries/ListInput.graphql.go => snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.go} (99%) rename generate/testdata/{queries/ListInput.graphql.json => snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.json} (99%) rename generate/testdata/{queries/ListOfListsOfLists.graphql.go => snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.go} (99%) rename generate/testdata/{queries/ListOfListsOfLists.graphql.json => snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.json} (99%) rename generate/testdata/{queries/Omitempty.graphql.go => snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.go} (99%) rename generate/testdata/{queries/Omitempty.graphql.json => snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.json} (99%) rename generate/testdata/{queries/Pointers.graphql.go => snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.go} (99%) rename generate/testdata/{queries/Pointers.graphql.json => snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.json} (99%) rename generate/testdata/{queries/PointersInline.graphql.go => snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.go} (99%) rename generate/testdata/{queries/PointersInline.graphql.json => snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.json} (99%) rename generate/testdata/{queries/QueryWithAlias.graphql.go => snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.go} (99%) rename generate/testdata/{queries/QueryWithAlias.graphql.json => snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.json} (99%) rename generate/testdata/{queries/QueryWithDoubleAlias.graphql.go => snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.go} (99%) rename generate/testdata/{queries/QueryWithDoubleAlias.graphql.json => snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.json} (99%) rename generate/testdata/{queries/QueryWithEnums.graphql.go => snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.go} (99%) rename generate/testdata/{queries/QueryWithEnums.graphql.json => snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.json} (99%) rename generate/testdata/{queries/QueryWithSlices.graphql.go => snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.go} (99%) rename generate/testdata/{queries/QueryWithSlices.graphql.json => snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.json} (99%) rename generate/testdata/{queries/QueryWithStructs.graphql.go => snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.go} (99%) rename generate/testdata/{queries/QueryWithStructs.graphql.json => snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.json} (99%) rename generate/testdata/{queries/SimpleInput.graphql.go => snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.go} (99%) rename generate/testdata/{queries/SimpleInput.graphql.json => snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.json} (99%) rename generate/testdata/{queries/SimpleMutation.graphql.go => snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.go} (99%) rename generate/testdata/{queries/SimpleMutation.graphql.json => snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.json} (99%) rename generate/testdata/{queries/SimpleQuery.graphql.go => snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.go} (99%) rename generate/testdata/{queries/SimpleQuery.graphql.json => snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.json} (99%) rename generate/testdata/{queries/TypeName.graphql.go => snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.go} (99%) rename generate/testdata/{queries/TypeName.graphql.json => snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.json} (99%) rename generate/testdata/{queries/UnionNoFragments.graphql.go => snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.go} (99%) rename generate/testdata/{queries/UnionNoFragments.graphql.json => snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.json} (99%) rename generate/testdata/{queries/UsesEnumTwice.graphql.go => snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.go} (99%) rename generate/testdata/{queries/UsesEnumTwice.graphql.json => snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.json} (99%) rename generate/testdata/{queries/unexported.graphql.go => snapshots/TestGenerate-unexported.graphql-unexported.graphql.go} (99%) rename generate/testdata/{queries/unexported.graphql.json => snapshots/TestGenerate-unexported.graphql-unexported.graphql.json} (99%) rename generate/testdata/{errors/InvalidQuery.go.error => snapshots/TestGenerateErrors-InvalidQuery.go} (50%) rename generate/testdata/{errors/InvalidQuery.graphql.error => snapshots/TestGenerateErrors-InvalidQuery.graphql} (96%) rename generate/testdata/{errors/InvalidScalar.go.error => snapshots/TestGenerateErrors-InvalidScalar.go} (87%) rename generate/testdata/{errors/InvalidScalar.graphql.error => snapshots/TestGenerateErrors-InvalidScalar.graphql} (87%) rename generate/testdata/{errors/InvalidSchema.go.error => snapshots/TestGenerateErrors-InvalidSchema.go} (95%) rename generate/testdata/{errors/InvalidSchema.graphql.error => snapshots/TestGenerateErrors-InvalidSchema.graphql} (95%) create mode 100644 generate/testdata/snapshots/TestGenerateErrors-NoQuery.go create mode 100644 generate/testdata/snapshots/TestGenerateErrors-NoQuery.graphql rename generate/testdata/{errors/UnknownScalar.go.error => snapshots/TestGenerateErrors-UnknownScalar.go} (58%) rename generate/testdata/{errors/UnknownScalar.graphql.error => snapshots/TestGenerateErrors-UnknownScalar.graphql} (58%) create mode 100644 internal/testutil/cupaloy.go diff --git a/generate/generate_test.go b/generate/generate_test.go index e982d027..2ff0ca5f 100644 --- a/generate/generate_test.go +++ b/generate/generate_test.go @@ -1,13 +1,13 @@ package generate import ( - "errors" - "go/format" "io/ioutil" "os" "path/filepath" "strings" "testing" + + "github.com/Khan/genqlient/internal/testutil" ) const ( @@ -15,52 +15,6 @@ const ( errorsDir = "testdata/errors" ) -func gofmt(filename, src string) (string, error) { - src = strings.TrimSpace(src) - formatted, err := format.Source([]byte(src)) - if err != nil { - return src, errorf(nil, "go parse error in %v: %v", filename, err) - } - return string(formatted), nil -} - -func checkSnapshot(t *testing.T, filename, content string) { - t.Helper() - update := (os.Getenv("UPDATE_SNAPSHOTS") == "1") - - expectedBytes, err := ioutil.ReadFile(filename) - if err != nil && !(update && errors.Is(err, os.ErrNotExist)) { - t.Fatal(err) - } - expectedContent := string(expectedBytes) - - if strings.HasSuffix(filename, ".go") { - fmted, err := gofmt(filename, expectedContent) - if err != nil { - // Ignore gofmt errors if we are updating - if !update { - t.Fatal(err) - } - } else { - expectedContent = fmted - } - } - - if content != expectedContent { - t.Errorf("mismatch in %v", filename) - if testing.Verbose() { - t.Errorf("got:\n%v\nwant:\n%v\n", content, expectedContent) - } - if update { - t.Log("Updating testdata dir to match") - err = ioutil.WriteFile(filename, []byte(content), 0o644) - if err != nil { - t.Errorf("Unable to update testdata dir: %v", err) - } - } - } -} - // TestGenerate is a snapshot-based test of code-generation. // // This file just has the test runner; the actual data is all in @@ -109,7 +63,9 @@ func TestGenerate(t *testing.T) { } for filename, content := range generated { - checkSnapshot(t, filepath.Join(dataDir, filename), string(content)) + t.Run(filename, func(t *testing.T) { + testutil.Cupaloy.SnapshotT(t, string(content)) + }) // TODO(benkraft): Also check that the code at least builds! } }) @@ -133,8 +89,8 @@ func TestGenerateErrors(t *testing.T) { continue } - schemaFilename := strings.TrimSuffix(sourceFilename, filepath.Ext(sourceFilename)) + ".schema.graphql" - errorsFilename := sourceFilename + ".error" + baseFilename := strings.TrimSuffix(sourceFilename, filepath.Ext(sourceFilename)) + schemaFilename := baseFilename + ".schema.graphql" t.Run(sourceFilename, func(t *testing.T) { _, err := Generate(&Config{ @@ -151,7 +107,7 @@ func TestGenerateErrors(t *testing.T) { t.Fatal("expected an error") } - checkSnapshot(t, filepath.Join(errorsDir, errorsFilename), err.Error()) + testutil.Cupaloy.SnapshotT(t, err.Error()) }) } } diff --git a/generate/parse_test.go b/generate/parse_test.go index eb040bd5..00977978 100644 --- a/generate/parse_test.go +++ b/generate/parse_test.go @@ -40,6 +40,7 @@ func getTestQueries(t *testing.T, ext string) *ast.QueryDocument { // produces equivalent results. We do not test the results it produces (that's // covered by TestGenerate), just that they are equivalent in different // languages (since TestGenerate only uses .graphql as input). +// TODO: redo this as more standard snapshot tests? func TestParse(t *testing.T) { extensions := []string{"go"} diff --git a/generate/testdata/errors/NoQuery.go.error b/generate/testdata/errors/NoQuery.go.error deleted file mode 100644 index 77fa55d1..00000000 --- a/generate/testdata/errors/NoQuery.go.error +++ /dev/null @@ -1 +0,0 @@ -no queries found, looked in: testdata/errors/NoQuery.go \ No newline at end of file diff --git a/generate/testdata/errors/NoQuery.graphql.error b/generate/testdata/errors/NoQuery.graphql.error deleted file mode 100644 index 7968485f..00000000 --- a/generate/testdata/errors/NoQuery.graphql.error +++ /dev/null @@ -1 +0,0 @@ -no queries found, looked in: testdata/errors/NoQuery.graphql \ No newline at end of file diff --git a/generate/testdata/queries/DateTime.graphql.go b/generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.go similarity index 99% rename from generate/testdata/queries/DateTime.graphql.go rename to generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.go index 6063f367..b59a0030 100644 --- a/generate/testdata/queries/DateTime.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.go @@ -37,3 +37,4 @@ query convertTimezone ($dt: DateTime!, $tz: String) { ) return &retval, err } + diff --git a/generate/testdata/queries/DateTime.graphql.json b/generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.json similarity index 99% rename from generate/testdata/queries/DateTime.graphql.json rename to generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.json index 8c94d7d1..0748fd93 100644 --- a/generate/testdata/queries/DateTime.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-DateTime.graphql-DateTime.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/DateTime.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/EmptyInterface.graphql.go b/generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.go similarity index 99% rename from generate/testdata/queries/EmptyInterface.graphql.go rename to generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.go index 5862462a..0e89acd0 100644 --- a/generate/testdata/queries/EmptyInterface.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.go @@ -30,3 +30,4 @@ query EmptyInterface { ) return &retval, err } + diff --git a/generate/testdata/queries/EmptyInterface.graphql.json b/generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.json similarity index 99% rename from generate/testdata/queries/EmptyInterface.graphql.json rename to generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.json index b4186f53..40fc77e0 100644 --- a/generate/testdata/queries/EmptyInterface.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-EmptyInterface.graphql-EmptyInterface.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/EmptyInterface.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/InputEnum.graphql.go b/generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.go similarity index 99% rename from generate/testdata/queries/InputEnum.graphql.go rename to generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.go index 17d133b6..fc03d808 100644 --- a/generate/testdata/queries/InputEnum.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.go @@ -62,3 +62,4 @@ query InputEnumQuery ($role: Role!) { ) return &retval, err } + diff --git a/generate/testdata/queries/InputEnum.graphql.json b/generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.json similarity index 99% rename from generate/testdata/queries/InputEnum.graphql.json rename to generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.json index 1e43b63b..7e9c9286 100644 --- a/generate/testdata/queries/InputEnum.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-InputEnum.graphql-InputEnum.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/InputEnum.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/InputObject.graphql.go b/generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.go similarity index 99% rename from generate/testdata/queries/InputObject.graphql.go rename to generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.go index 336cc34c..2f844be0 100644 --- a/generate/testdata/queries/InputObject.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.go @@ -79,3 +79,4 @@ query InputObjectQuery ($query: UserQueryInput) { ) return &retval, err } + diff --git a/generate/testdata/queries/InputObject.graphql.json b/generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.json similarity index 99% rename from generate/testdata/queries/InputObject.graphql.json rename to generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.json index 58588a6d..ff0c6519 100644 --- a/generate/testdata/queries/InputObject.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-InputObject.graphql-InputObject.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/InputObject.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/InterfaceNesting.graphql.go b/generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.go similarity index 99% rename from generate/testdata/queries/InterfaceNesting.graphql.go rename to generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.go index 45977309..d1e2af22 100644 --- a/generate/testdata/queries/InterfaceNesting.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.go @@ -401,3 +401,4 @@ query InterfaceNesting { ) return &retval, err } + diff --git a/generate/testdata/queries/InterfaceNesting.graphql.json b/generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.json similarity index 99% rename from generate/testdata/queries/InterfaceNesting.graphql.json rename to generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.json index c2e973cf..03766ca6 100644 --- a/generate/testdata/queries/InterfaceNesting.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-InterfaceNesting.graphql-InterfaceNesting.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/InterfaceNesting.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/InterfaceNoFragments.graphql.go b/generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.go similarity index 99% rename from generate/testdata/queries/InterfaceNoFragments.graphql.go rename to generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.go index 0e49bbeb..e7761dfb 100644 --- a/generate/testdata/queries/InterfaceNoFragments.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.go @@ -131,3 +131,4 @@ query InterfaceNoFragmentsQuery { ) return &retval, err } + diff --git a/generate/testdata/queries/InterfaceNoFragments.graphql.json b/generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.json similarity index 99% rename from generate/testdata/queries/InterfaceNoFragments.graphql.json rename to generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.json index 598769e1..e5390dbd 100644 --- a/generate/testdata/queries/InterfaceNoFragments.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-InterfaceNoFragments.graphql-InterfaceNoFragments.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/InterfaceNoFragments.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/ListInput.graphql.go b/generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.go similarity index 99% rename from generate/testdata/queries/ListInput.graphql.go rename to generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.go index b5553c51..917e7fdb 100644 --- a/generate/testdata/queries/ListInput.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.go @@ -51,3 +51,4 @@ query ListInputQuery ($names: [String]) { ) return &retval, err } + diff --git a/generate/testdata/queries/ListInput.graphql.json b/generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.json similarity index 99% rename from generate/testdata/queries/ListInput.graphql.json rename to generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.json index 5bd96b08..bf698866 100644 --- a/generate/testdata/queries/ListInput.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-ListInput.graphql-ListInput.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/ListInput.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/ListOfListsOfLists.graphql.go b/generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.go similarity index 99% rename from generate/testdata/queries/ListOfListsOfLists.graphql.go rename to generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.go index df67fcef..f27943e2 100644 --- a/generate/testdata/queries/ListOfListsOfLists.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.go @@ -28,3 +28,4 @@ query ListOfListsOfLists { ) return &retval, err } + diff --git a/generate/testdata/queries/ListOfListsOfLists.graphql.json b/generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.json similarity index 99% rename from generate/testdata/queries/ListOfListsOfLists.graphql.json rename to generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.json index 083f03bd..9bcde13a 100644 --- a/generate/testdata/queries/ListOfListsOfLists.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-ListOfListsOfLists.graphql-ListOfListsOfLists.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/ListOfListsOfLists.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/Omitempty.graphql.go b/generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.go similarity index 99% rename from generate/testdata/queries/Omitempty.graphql.go rename to generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.go index b6853a5f..77c2d583 100644 --- a/generate/testdata/queries/Omitempty.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.go @@ -123,3 +123,4 @@ query OmitEmptyQuery ($query: UserQueryInput, $queries: [UserQueryInput], $dt: D ) return &retval, err } + diff --git a/generate/testdata/queries/Omitempty.graphql.json b/generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.json similarity index 99% rename from generate/testdata/queries/Omitempty.graphql.json rename to generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.json index 8fcedc6e..00629dc7 100644 --- a/generate/testdata/queries/Omitempty.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-Omitempty.graphql-Omitempty.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/Omitempty.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/Pointers.graphql.go b/generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.go similarity index 99% rename from generate/testdata/queries/Pointers.graphql.go rename to generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.go index 23025344..8862ff9f 100644 --- a/generate/testdata/queries/Pointers.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.go @@ -114,3 +114,4 @@ query PointersQuery ($query: UserQueryInput, $dt: DateTime, $tz: String) { ) return &retval, err } + diff --git a/generate/testdata/queries/Pointers.graphql.json b/generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.json similarity index 99% rename from generate/testdata/queries/Pointers.graphql.json rename to generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.json index 59d9fe2a..a5aa1a9c 100644 --- a/generate/testdata/queries/Pointers.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-Pointers.graphql-Pointers.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/Pointers.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/PointersInline.graphql.go b/generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.go similarity index 99% rename from generate/testdata/queries/PointersInline.graphql.go rename to generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.go index 3baa4d0e..8ab05986 100644 --- a/generate/testdata/queries/PointersInline.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.go @@ -114,3 +114,4 @@ query PointersQuery ($query: UserQueryInput, $dt: DateTime, $tz: String) { ) return &retval, err } + diff --git a/generate/testdata/queries/PointersInline.graphql.json b/generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.json similarity index 99% rename from generate/testdata/queries/PointersInline.graphql.json rename to generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.json index 4c7b01f3..9c358e56 100644 --- a/generate/testdata/queries/PointersInline.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-PointersInline.graphql-PointersInline.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/PointersInline.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/QueryWithAlias.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.go similarity index 99% rename from generate/testdata/queries/QueryWithAlias.graphql.go rename to generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.go index a56827e3..4b3e54f3 100644 --- a/generate/testdata/queries/QueryWithAlias.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.go @@ -51,3 +51,4 @@ query QueryWithAlias { ) return &retval, err } + diff --git a/generate/testdata/queries/QueryWithAlias.graphql.json b/generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.json similarity index 99% rename from generate/testdata/queries/QueryWithAlias.graphql.json rename to generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.json index b0e97631..53bd7f3f 100644 --- a/generate/testdata/queries/QueryWithAlias.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-QueryWithAlias.graphql-QueryWithAlias.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/QueryWithAlias.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/QueryWithDoubleAlias.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.go similarity index 99% rename from generate/testdata/queries/QueryWithDoubleAlias.graphql.go rename to generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.go index 3d7630d3..1697b34d 100644 --- a/generate/testdata/queries/QueryWithDoubleAlias.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.go @@ -51,3 +51,4 @@ query QueryWithDoubleAlias { ) return &retval, err } + diff --git a/generate/testdata/queries/QueryWithDoubleAlias.graphql.json b/generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.json similarity index 99% rename from generate/testdata/queries/QueryWithDoubleAlias.graphql.json rename to generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.json index af143c63..ed3eccc4 100644 --- a/generate/testdata/queries/QueryWithDoubleAlias.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-QueryWithDoubleAlias.graphql-QueryWithDoubleAlias.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/QueryWithDoubleAlias.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/QueryWithEnums.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.go similarity index 99% rename from generate/testdata/queries/QueryWithEnums.graphql.go rename to generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.go index 7c373f20..a62b3a9d 100644 --- a/generate/testdata/queries/QueryWithEnums.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.go @@ -72,3 +72,4 @@ query QueryWithEnums { ) return &retval, err } + diff --git a/generate/testdata/queries/QueryWithEnums.graphql.json b/generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.json similarity index 99% rename from generate/testdata/queries/QueryWithEnums.graphql.json rename to generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.json index 43346ade..7bc3ff6d 100644 --- a/generate/testdata/queries/QueryWithEnums.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-QueryWithEnums.graphql-QueryWithEnums.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/QueryWithEnums.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/QueryWithSlices.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.go similarity index 99% rename from generate/testdata/queries/QueryWithSlices.graphql.go rename to generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.go index 6a536256..9ba2f53b 100644 --- a/generate/testdata/queries/QueryWithSlices.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.go @@ -48,3 +48,4 @@ query QueryWithSlices { ) return &retval, err } + diff --git a/generate/testdata/queries/QueryWithSlices.graphql.json b/generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.json similarity index 99% rename from generate/testdata/queries/QueryWithSlices.graphql.json rename to generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.json index b549b70d..2df95eee 100644 --- a/generate/testdata/queries/QueryWithSlices.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-QueryWithSlices.graphql-QueryWithSlices.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/QueryWithSlices.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/QueryWithStructs.graphql.go b/generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.go similarity index 99% rename from generate/testdata/queries/QueryWithStructs.graphql.go rename to generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.go index a58824a3..0cc5f8d0 100644 --- a/generate/testdata/queries/QueryWithStructs.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.go @@ -51,3 +51,4 @@ query QueryWithStructs { ) return &retval, err } + diff --git a/generate/testdata/queries/QueryWithStructs.graphql.json b/generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.json similarity index 99% rename from generate/testdata/queries/QueryWithStructs.graphql.json rename to generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.json index 52e9c9ba..1a8af53e 100644 --- a/generate/testdata/queries/QueryWithStructs.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-QueryWithStructs.graphql-QueryWithStructs.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/QueryWithStructs.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/SimpleInput.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.go similarity index 99% rename from generate/testdata/queries/SimpleInput.graphql.go rename to generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.go index 57c59011..a6e85c2c 100644 --- a/generate/testdata/queries/SimpleInput.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.go @@ -51,3 +51,4 @@ query SimpleInputQuery ($name: String!) { ) return &retval, err } + diff --git a/generate/testdata/queries/SimpleInput.graphql.json b/generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.json similarity index 99% rename from generate/testdata/queries/SimpleInput.graphql.json rename to generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.json index d929f601..038be490 100644 --- a/generate/testdata/queries/SimpleInput.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-SimpleInput.graphql-SimpleInput.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/SimpleInput.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/SimpleMutation.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.go similarity index 99% rename from generate/testdata/queries/SimpleMutation.graphql.go rename to generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.go index 68671b58..5095d8ca 100644 --- a/generate/testdata/queries/SimpleMutation.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.go @@ -53,3 +53,4 @@ mutation SimpleMutation ($name: String!) { ) return &retval, err } + diff --git a/generate/testdata/queries/SimpleMutation.graphql.json b/generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.json similarity index 99% rename from generate/testdata/queries/SimpleMutation.graphql.json rename to generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.json index 2191897f..a6302391 100644 --- a/generate/testdata/queries/SimpleMutation.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-SimpleMutation.graphql-SimpleMutation.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/SimpleMutation.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/SimpleQuery.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.go similarity index 99% rename from generate/testdata/queries/SimpleQuery.graphql.go rename to generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.go index e700f1e5..e43cdc7b 100644 --- a/generate/testdata/queries/SimpleQuery.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.go @@ -46,3 +46,4 @@ query SimpleQuery { ) return &retval, err } + diff --git a/generate/testdata/queries/SimpleQuery.graphql.json b/generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.json similarity index 99% rename from generate/testdata/queries/SimpleQuery.graphql.json rename to generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.json index 3029ca4a..3868f193 100644 --- a/generate/testdata/queries/SimpleQuery.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-SimpleQuery.graphql-SimpleQuery.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/SimpleQuery.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/TypeName.graphql.go b/generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.go similarity index 99% rename from generate/testdata/queries/TypeName.graphql.go rename to generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.go index 888a661b..3f9c8639 100644 --- a/generate/testdata/queries/TypeName.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.go @@ -48,3 +48,4 @@ query TypeNameQuery { ) return &retval, err } + diff --git a/generate/testdata/queries/TypeName.graphql.json b/generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.json similarity index 99% rename from generate/testdata/queries/TypeName.graphql.json rename to generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.json index cb254215..16f61e9d 100644 --- a/generate/testdata/queries/TypeName.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-TypeName.graphql-TypeName.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/TypeName.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/UnionNoFragments.graphql.go b/generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.go similarity index 99% rename from generate/testdata/queries/UnionNoFragments.graphql.go rename to generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.go index d8e934d0..9acc72ff 100644 --- a/generate/testdata/queries/UnionNoFragments.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.go @@ -97,3 +97,4 @@ query UnionNoFragmentsQuery { ) return &retval, err } + diff --git a/generate/testdata/queries/UnionNoFragments.graphql.json b/generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.json similarity index 99% rename from generate/testdata/queries/UnionNoFragments.graphql.json rename to generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.json index c9971b45..73cd88e1 100644 --- a/generate/testdata/queries/UnionNoFragments.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-UnionNoFragments.graphql-UnionNoFragments.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/UnionNoFragments.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/UsesEnumTwice.graphql.go b/generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.go similarity index 99% rename from generate/testdata/queries/UsesEnumTwice.graphql.go rename to generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.go index a2310e86..a16c444c 100644 --- a/generate/testdata/queries/UsesEnumTwice.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.go @@ -72,3 +72,4 @@ query UsesEnumTwiceQuery { ) return &retval, err } + diff --git a/generate/testdata/queries/UsesEnumTwice.graphql.json b/generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.json similarity index 99% rename from generate/testdata/queries/UsesEnumTwice.graphql.json rename to generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.json index 647821db..69eba0e4 100644 --- a/generate/testdata/queries/UsesEnumTwice.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-UsesEnumTwice.graphql-UsesEnumTwice.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/UsesEnumTwice.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/queries/unexported.graphql.go b/generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.go similarity index 99% rename from generate/testdata/queries/unexported.graphql.go rename to generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.go index 7ffe82d2..c07b8149 100644 --- a/generate/testdata/queries/unexported.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.go @@ -79,3 +79,4 @@ query unexported ($query: UserQueryInput) { ) return &retval, err } + diff --git a/generate/testdata/queries/unexported.graphql.json b/generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.json similarity index 99% rename from generate/testdata/queries/unexported.graphql.json rename to generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.json index 28089e7a..de76765d 100644 --- a/generate/testdata/queries/unexported.graphql.json +++ b/generate/testdata/snapshots/TestGenerate-unexported.graphql-unexported.graphql.json @@ -6,4 +6,4 @@ "sourceLocation": "testdata/queries/unexported.graphql" } ] -} \ No newline at end of file +} diff --git a/generate/testdata/errors/InvalidQuery.go.error b/generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.go similarity index 50% rename from generate/testdata/errors/InvalidQuery.go.error rename to generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.go index 2545e3a1..6bfd1703 100644 --- a/generate/testdata/errors/InvalidQuery.go.error +++ b/generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.go @@ -1 +1 @@ -testdata/errors/InvalidQuery.go:4: query-spec does not match schema: Cannot query field "g" on type "Query". Did you mean "f"? \ No newline at end of file +testdata/errors/InvalidQuery.go:4: query-spec does not match schema: Cannot query field "g" on type "Query". Did you mean "f"? diff --git a/generate/testdata/errors/InvalidQuery.graphql.error b/generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.graphql similarity index 96% rename from generate/testdata/errors/InvalidQuery.graphql.error rename to generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.graphql index 99c63265..e14c7071 100644 --- a/generate/testdata/errors/InvalidQuery.graphql.error +++ b/generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.graphql @@ -1 +1 @@ -testdata/errors/InvalidQuery.graphql:1: query-spec does not match schema: Cannot query field "g" on type "Query". Did you mean "f"? \ No newline at end of file +testdata/errors/InvalidQuery.graphql:1: query-spec does not match schema: Cannot query field "g" on type "Query". Did you mean "f"? diff --git a/generate/testdata/errors/InvalidScalar.go.error b/generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.go similarity index 87% rename from generate/testdata/errors/InvalidScalar.go.error rename to generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.go index fe1b1c87..8a8a5aa8 100644 --- a/generate/testdata/errors/InvalidScalar.go.error +++ b/generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.go @@ -1 +1 @@ -invalid type-name "bogus" (unknown type-name "bogus"); expected a builtin, path/to/package.Name, interface{}, or a slice, map, or pointer of those \ No newline at end of file +invalid type-name "bogus" (unknown type-name "bogus"); expected a builtin, path/to/package.Name, interface{}, or a slice, map, or pointer of those diff --git a/generate/testdata/errors/InvalidScalar.graphql.error b/generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.graphql similarity index 87% rename from generate/testdata/errors/InvalidScalar.graphql.error rename to generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.graphql index fe1b1c87..8a8a5aa8 100644 --- a/generate/testdata/errors/InvalidScalar.graphql.error +++ b/generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.graphql @@ -1 +1 @@ -invalid type-name "bogus" (unknown type-name "bogus"); expected a builtin, path/to/package.Name, interface{}, or a slice, map, or pointer of those \ No newline at end of file +invalid type-name "bogus" (unknown type-name "bogus"); expected a builtin, path/to/package.Name, interface{}, or a slice, map, or pointer of those diff --git a/generate/testdata/errors/InvalidSchema.go.error b/generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.go similarity index 95% rename from generate/testdata/errors/InvalidSchema.go.error rename to generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.go index 9f41e23c..6aad6cd5 100644 --- a/generate/testdata/errors/InvalidSchema.go.error +++ b/generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.go @@ -1 +1 @@ -testdata/errors/InvalidSchema.schema.graphql:4: invalid schema file testdata/errors/InvalidSchema.schema.graphql: Expected :, found } \ No newline at end of file +testdata/errors/InvalidSchema.schema.graphql:4: invalid schema file testdata/errors/InvalidSchema.schema.graphql: Expected :, found } diff --git a/generate/testdata/errors/InvalidSchema.graphql.error b/generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.graphql similarity index 95% rename from generate/testdata/errors/InvalidSchema.graphql.error rename to generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.graphql index 9f41e23c..6aad6cd5 100644 --- a/generate/testdata/errors/InvalidSchema.graphql.error +++ b/generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.graphql @@ -1 +1 @@ -testdata/errors/InvalidSchema.schema.graphql:4: invalid schema file testdata/errors/InvalidSchema.schema.graphql: Expected :, found } \ No newline at end of file +testdata/errors/InvalidSchema.schema.graphql:4: invalid schema file testdata/errors/InvalidSchema.schema.graphql: Expected :, found } diff --git a/generate/testdata/snapshots/TestGenerateErrors-NoQuery.go b/generate/testdata/snapshots/TestGenerateErrors-NoQuery.go new file mode 100644 index 00000000..31df7bfb --- /dev/null +++ b/generate/testdata/snapshots/TestGenerateErrors-NoQuery.go @@ -0,0 +1 @@ +no queries found, looked in: testdata/errors/NoQuery.go diff --git a/generate/testdata/snapshots/TestGenerateErrors-NoQuery.graphql b/generate/testdata/snapshots/TestGenerateErrors-NoQuery.graphql new file mode 100644 index 00000000..fe310044 --- /dev/null +++ b/generate/testdata/snapshots/TestGenerateErrors-NoQuery.graphql @@ -0,0 +1 @@ +no queries found, looked in: testdata/errors/NoQuery.graphql diff --git a/generate/testdata/errors/UnknownScalar.go.error b/generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.go similarity index 58% rename from generate/testdata/errors/UnknownScalar.go.error rename to generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.go index 04be9c24..c3d339b4 100644 --- a/generate/testdata/errors/UnknownScalar.go.error +++ b/generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.go @@ -1 +1 @@ -testdata/errors/UnknownScalar.schema.graphql:3: unknown scalar UnknownScalar: please add it to genqlient.yaml \ No newline at end of file +testdata/errors/UnknownScalar.schema.graphql:3: unknown scalar UnknownScalar: please add it to genqlient.yaml diff --git a/generate/testdata/errors/UnknownScalar.graphql.error b/generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.graphql similarity index 58% rename from generate/testdata/errors/UnknownScalar.graphql.error rename to generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.graphql index 04be9c24..c3d339b4 100644 --- a/generate/testdata/errors/UnknownScalar.graphql.error +++ b/generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.graphql @@ -1 +1 @@ -testdata/errors/UnknownScalar.schema.graphql:3: unknown scalar UnknownScalar: please add it to genqlient.yaml \ No newline at end of file +testdata/errors/UnknownScalar.schema.graphql:3: unknown scalar UnknownScalar: please add it to genqlient.yaml diff --git a/go.mod b/go.mod index 47822e96..17fdb279 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/Khan/genqlient go 1.13 require ( + github.com/bradleyjkemp/cupaloy/v2 v2.6.0 github.com/vektah/gqlparser/v2 v2.1.0 golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6 gopkg.in/yaml.v2 v2.2.4 diff --git a/go.sum b/go.sum index f26c3474..5807a1a8 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,10 @@ github.com/agnivade/levenshtein v1.0.1 h1:3oJU7J3FGFmyhn8KHjmVaZCN5hxTr7GxgRue+s github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/bradleyjkemp/cupaloy v1.3.0 h1:UJ0YJuhkMXEQcaoQNSCmK8og6GEVW/eDhAZuizvcpOY= +github.com/bradleyjkemp/cupaloy v2.3.0+incompatible h1:UafIjBvWQmS9i/xRg+CamMrnLTKNzo+bdmT/oH34c2Y= +github.com/bradleyjkemp/cupaloy/v2 v2.6.0 h1:knToPYa2xtfg42U3I6punFEjaGFKWQRXJwj0JTv4mTs= +github.com/bradleyjkemp/cupaloy/v2 v2.6.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -16,8 +20,10 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/vektah/gqlparser/v2 v2.1.0 h1:uiKJ+T5HMGGQM2kRKQ8Pxw8+Zq9qhhZhz/lieYvCMns= github.com/vektah/gqlparser/v2 v2.1.0/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4XkV2se04Px1Ms= golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6 h1:iZgcI2DDp6zW5v9Z/5+f0NuqoxNdmzg4hivjk2WLXpY= @@ -29,3 +35,4 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/testutil/cupaloy.go b/internal/testutil/cupaloy.go new file mode 100644 index 00000000..59c222ef --- /dev/null +++ b/internal/testutil/cupaloy.go @@ -0,0 +1,5 @@ +package testutil + +import "github.com/bradleyjkemp/cupaloy/v2" + +var Cupaloy = cupaloy.New(cupaloy.SnapshotSubdirectory("testdata/snapshots"))