From 639b46df322bc69d9b144f8b5611a1a531061e9f Mon Sep 17 00:00:00 2001 From: Ben Kraft Date: Tue, 14 Sep 2021 10:30:33 -0700 Subject: [PATCH] Avoid putting incorrect extensions on error snapshot files (#92) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary: They were accidentally ending up as `.go` or `.graphql`, but are actually just text. Issue: https://github.com/Khan/genqlient/issues/90 ## Test plan: make check Author: benjaminjkraft Reviewers: StevenACoffman, dnerdy Required Reviewers: Approved By: StevenACoffman Checks: ✅ Test (1.17), ✅ Test (1.16), ✅ Test (1.15), ✅ Test (1.14), ✅ Lint, ✅ Test (1.17), ✅ Test (1.16), ✅ Test (1.15), ✅ Test (1.14), ✅ Lint Pull Request URL: https://github.com/Khan/genqlient/pull/92 --- generate/generate_test.go | 3 ++- ....go => TestGenerateErrors-BindingWithIncorrectSelection-go} | 0 ...> TestGenerateErrors-BindingWithIncorrectSelection-graphql} | 0 ...lections.go => TestGenerateErrors-ConflictingSelections-go} | 0 ...raphql => TestGenerateErrors-ConflictingSelections-graphql} | 0 ...rors-InvalidQuery.go => TestGenerateErrors-InvalidQuery-go} | 0 ...idQuery.graphql => TestGenerateErrors-InvalidQuery-graphql} | 0 ...rs-InvalidScalar.go => TestGenerateErrors-InvalidScalar-go} | 0 ...Scalar.graphql => TestGenerateErrors-InvalidScalar-graphql} | 0 ...rs-InvalidSchema.go => TestGenerateErrors-InvalidSchema-go} | 0 ...Schema.graphql => TestGenerateErrors-InvalidSchema-graphql} | 0 .../testdata/snapshots/TestGenerateErrors-MissingTypeName.go | 1 - .../snapshots/TestGenerateErrors-MissingTypeName.graphql | 1 - ...GenerateErrors-NoQuery.go => TestGenerateErrors-NoQuery-go} | 0 ...rors-NoQuery.graphql => TestGenerateErrors-NoQuery-graphql} | 0 ...rs-UnknownScalar.go => TestGenerateErrors-UnknownScalar-go} | 0 ...Scalar.graphql => TestGenerateErrors-UnknownScalar-graphql} | 0 17 files changed, 2 insertions(+), 3 deletions(-) rename generate/testdata/snapshots/{TestGenerateErrors-BindingWithIncorrectSelection.go => TestGenerateErrors-BindingWithIncorrectSelection-go} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-BindingWithIncorrectSelection.graphql => TestGenerateErrors-BindingWithIncorrectSelection-graphql} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-ConflictingSelections.go => TestGenerateErrors-ConflictingSelections-go} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-ConflictingSelections.graphql => TestGenerateErrors-ConflictingSelections-graphql} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-InvalidQuery.go => TestGenerateErrors-InvalidQuery-go} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-InvalidQuery.graphql => TestGenerateErrors-InvalidQuery-graphql} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-InvalidScalar.go => TestGenerateErrors-InvalidScalar-go} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-InvalidScalar.graphql => TestGenerateErrors-InvalidScalar-graphql} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-InvalidSchema.go => TestGenerateErrors-InvalidSchema-go} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-InvalidSchema.graphql => TestGenerateErrors-InvalidSchema-graphql} (100%) delete mode 100644 generate/testdata/snapshots/TestGenerateErrors-MissingTypeName.go delete mode 100644 generate/testdata/snapshots/TestGenerateErrors-MissingTypeName.graphql rename generate/testdata/snapshots/{TestGenerateErrors-NoQuery.go => TestGenerateErrors-NoQuery-go} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-NoQuery.graphql => TestGenerateErrors-NoQuery-graphql} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-UnknownScalar.go => TestGenerateErrors-UnknownScalar-go} (100%) rename generate/testdata/snapshots/{TestGenerateErrors-UnknownScalar.graphql => TestGenerateErrors-UnknownScalar-graphql} (100%) diff --git a/generate/generate_test.go b/generate/generate_test.go index 566eb32..94d925d 100644 --- a/generate/generate_test.go +++ b/generate/generate_test.go @@ -250,8 +250,9 @@ func TestGenerateErrors(t *testing.T) { baseFilename := strings.TrimSuffix(sourceFilename, filepath.Ext(sourceFilename)) schemaFilename := baseFilename + ".schema.graphql" + testFilename := strings.ReplaceAll(sourceFilename, ".", "/") - t.Run(sourceFilename, func(t *testing.T) { + t.Run(testFilename, func(t *testing.T) { _, err := Generate(&Config{ Schema: filepath.Join(errorsDir, schemaFilename), Operations: []string{filepath.Join(errorsDir, sourceFilename)}, diff --git a/generate/testdata/snapshots/TestGenerateErrors-BindingWithIncorrectSelection.go b/generate/testdata/snapshots/TestGenerateErrors-BindingWithIncorrectSelection-go similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-BindingWithIncorrectSelection.go rename to generate/testdata/snapshots/TestGenerateErrors-BindingWithIncorrectSelection-go diff --git a/generate/testdata/snapshots/TestGenerateErrors-BindingWithIncorrectSelection.graphql b/generate/testdata/snapshots/TestGenerateErrors-BindingWithIncorrectSelection-graphql similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-BindingWithIncorrectSelection.graphql rename to generate/testdata/snapshots/TestGenerateErrors-BindingWithIncorrectSelection-graphql diff --git a/generate/testdata/snapshots/TestGenerateErrors-ConflictingSelections.go b/generate/testdata/snapshots/TestGenerateErrors-ConflictingSelections-go similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-ConflictingSelections.go rename to generate/testdata/snapshots/TestGenerateErrors-ConflictingSelections-go diff --git a/generate/testdata/snapshots/TestGenerateErrors-ConflictingSelections.graphql b/generate/testdata/snapshots/TestGenerateErrors-ConflictingSelections-graphql similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-ConflictingSelections.graphql rename to generate/testdata/snapshots/TestGenerateErrors-ConflictingSelections-graphql diff --git a/generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.go b/generate/testdata/snapshots/TestGenerateErrors-InvalidQuery-go similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.go rename to generate/testdata/snapshots/TestGenerateErrors-InvalidQuery-go diff --git a/generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.graphql b/generate/testdata/snapshots/TestGenerateErrors-InvalidQuery-graphql similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-InvalidQuery.graphql rename to generate/testdata/snapshots/TestGenerateErrors-InvalidQuery-graphql diff --git a/generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.go b/generate/testdata/snapshots/TestGenerateErrors-InvalidScalar-go similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.go rename to generate/testdata/snapshots/TestGenerateErrors-InvalidScalar-go diff --git a/generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.graphql b/generate/testdata/snapshots/TestGenerateErrors-InvalidScalar-graphql similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-InvalidScalar.graphql rename to generate/testdata/snapshots/TestGenerateErrors-InvalidScalar-graphql diff --git a/generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.go b/generate/testdata/snapshots/TestGenerateErrors-InvalidSchema-go similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.go rename to generate/testdata/snapshots/TestGenerateErrors-InvalidSchema-go diff --git a/generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.graphql b/generate/testdata/snapshots/TestGenerateErrors-InvalidSchema-graphql similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-InvalidSchema.graphql rename to generate/testdata/snapshots/TestGenerateErrors-InvalidSchema-graphql diff --git a/generate/testdata/snapshots/TestGenerateErrors-MissingTypeName.go b/generate/testdata/snapshots/TestGenerateErrors-MissingTypeName.go deleted file mode 100644 index 55834ad..0000000 --- a/generate/testdata/snapshots/TestGenerateErrors-MissingTypeName.go +++ /dev/null @@ -1 +0,0 @@ -testdata/errors/MissingTypeName.schema.graphql:2: union/interface type I must request __typename diff --git a/generate/testdata/snapshots/TestGenerateErrors-MissingTypeName.graphql b/generate/testdata/snapshots/TestGenerateErrors-MissingTypeName.graphql deleted file mode 100644 index 55834ad..0000000 --- a/generate/testdata/snapshots/TestGenerateErrors-MissingTypeName.graphql +++ /dev/null @@ -1 +0,0 @@ -testdata/errors/MissingTypeName.schema.graphql:2: union/interface type I must request __typename diff --git a/generate/testdata/snapshots/TestGenerateErrors-NoQuery.go b/generate/testdata/snapshots/TestGenerateErrors-NoQuery-go similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-NoQuery.go rename to generate/testdata/snapshots/TestGenerateErrors-NoQuery-go diff --git a/generate/testdata/snapshots/TestGenerateErrors-NoQuery.graphql b/generate/testdata/snapshots/TestGenerateErrors-NoQuery-graphql similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-NoQuery.graphql rename to generate/testdata/snapshots/TestGenerateErrors-NoQuery-graphql diff --git a/generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.go b/generate/testdata/snapshots/TestGenerateErrors-UnknownScalar-go similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.go rename to generate/testdata/snapshots/TestGenerateErrors-UnknownScalar-go diff --git a/generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.graphql b/generate/testdata/snapshots/TestGenerateErrors-UnknownScalar-graphql similarity index 100% rename from generate/testdata/snapshots/TestGenerateErrors-UnknownScalar.graphql rename to generate/testdata/snapshots/TestGenerateErrors-UnknownScalar-graphql