return nil schema on error

graphql-go · Apr 25, 2020 · fcd314a · fcd314a
1 parent 02caa89
commit fcd314a
Show file tree

Hide file tree

Showing 23 changed files with 180 additions and 178 deletions.
diff --git a/abstract_test.go b/abstract_test.go
@@ -147,7 +147,7 @@ func TestIsTypeOfUsedToResolveRuntimeTypeForInterface(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if len(result.Errors) != 0 {
@@ -284,7 +284,7 @@ func TestAppendTypeUsedToAddRuntimeCustomScalarTypeForInterface(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if len(result.Errors) != 0 {
@@ -384,7 +384,7 @@ func TestIsTypeOfUsedToResolveRuntimeTypeForUnion(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if len(result.Errors) != 0 {
@@ -523,7 +523,7 @@ func TestResolveTypeOnInterfaceYieldsUsefulError(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if !testutil.EqualResults(expected, result) {
@@ -647,7 +647,7 @@ func TestResolveTypeOnUnionYieldsUsefulError(t *testing.T) {
 	}
 
 	result := graphql.Do(graphql.Params{
-		Schema:        schema,
+		Schema:        *schema,
 		RequestString: query,
 	})
 	if !testutil.EqualResults(expected, result) {

diff --git a/benchutil/list_schema.go b/benchutil/list_schema.go
@@ -80,7 +80,7 @@ func ListSchemaWithXItems(x int) graphql.Schema {
 		Query: queryType,
 	})
 
-	return colorSchema
+	return *colorSchema
 }
 
 var colors []color

diff --git a/benchutil/wide_schema.go b/benchutil/wide_schema.go
@@ -33,7 +33,7 @@ func WideSchemaWithXFieldsAndYItems(x int, y int) graphql.Schema {
 		Query: queryType,
 	})
 
-	return wideSchema
+	return *wideSchema
 }
 
 func generateXWideFields(x int) graphql.Fields {

diff --git a/directives_test.go b/directives_test.go
@@ -31,7 +31,7 @@ var directivesTestData map[string]interface{} = map[string]interface{}{
 func executeDirectivesTestQuery(t *testing.T, doc string) *graphql.Result {
 	ast := testutil.TestParse(t, doc)
 	ep := graphql.ExecuteParams{
-		Schema: directivesTestSchema,
+		Schema: *directivesTestSchema,
 		AST:    ast,
 		Root:   directivesTestData,
 	}

diff --git a/enum_type_test.go b/enum_type_test.go
@@ -123,14 +123,14 @@ var enumTypeTestSchema, _ = graphql.NewSchema(graphql.SchemaConfig{
 
 func executeEnumTypeTest(t *testing.T, query string) *graphql.Result {
 	result := g(t, graphql.Params{
-		Schema:        enumTypeTestSchema,
+		Schema:        *enumTypeTestSchema,
 		RequestString: query,
 	})
 	return result
 }
 func executeEnumTypeTestWithParams(t *testing.T, query string, params map[string]interface{}) *graphql.Result {
 	result := g(t, graphql.Params{
-		Schema:         enumTypeTestSchema,
+		Schema:         *enumTypeTestSchema,
 		RequestString:  query,
 		VariableValues: params,
 	})
@@ -414,7 +414,7 @@ func TestTypeSystem_EnumValues_EnumValueMayBePointer(t *testing.T) {
 				"color": "GREEN",
 				"foo":   1}}}
 	result := g(t, graphql.Params{
-		Schema:        enumTypeTestSchema,
+		Schema:        *enumTypeTestSchema,
 		RequestString: query,
 	})
 	if !reflect.DeepEqual(expected, result) {
@@ -453,7 +453,7 @@ func TestTypeSystem_EnumValues_EnumValueMayBeNilPointer(t *testing.T) {
 			}},
 	}
 	result := g(t, graphql.Params{
-		Schema:        enumTypeTestSchema,
+		Schema:        *enumTypeTestSchema,
 		RequestString: query,
 	})
 	if !reflect.DeepEqual(expected, result) {

diff --git a/executor_resolve_test.go b/executor_resolve_test.go
@@ -20,7 +20,7 @@ func testSchema(t *testing.T, testField *graphql.Field) graphql.Schema {
 	if err != nil {
 		t.Fatalf("Invalid schema: %v", err)
 	}
-	return schema
+	return *schema
 }
 
 func TestExecutesResolveFunction_DefaultFunctionAccessesProperties(t *testing.T) {

diff --git a/executor_schema_test.go b/executor_schema_test.go
@@ -302,7 +302,7 @@ func TestExecutesUsingAComplexSchema(t *testing.T) {
 
 	// execute
 	ep := graphql.ExecuteParams{
-		Schema: blogSchema,
+		Schema: *blogSchema,
 		AST:    ast,
 	}
 	result := testutil.TestExecute(t, ep)