subscription: more tests cases

Author: remorses

subscription.go

@@ -228,8 +228,7 @@ func ExecuteSubscription(p ExecuteParams) chan *Result {
 				select {
 				case <-p.Context.Done():
 					println("context cancelled")
-
-					// TODO send the context error to the resultchannel
+					// TODO send the context error to the resultchannel?
 					return
 
 				case res, more := <-sub:
@@ -243,7 +242,6 @@ func ExecuteSubscription(p ExecuteParams) chan *Result {
 		default:
 			fmt.Println(fieldResult)
 			resultChannel <- mapSourceToResponse(fieldResult)
-
 			return
 		}
 	}()

subscription_test.go

@@ -155,6 +155,9 @@ func TestSchemaSubscribe(t *testing.T) {
 							{
 								"field": "bye",
 							},
+							{
+								"field": nil,
+							},
 						}),
 					},
 				},
@@ -169,6 +172,7 @@ func TestSchemaSubscribe(t *testing.T) {
 			ExpectedResults: []testutil.TestResponse{
 				{Data: `{ "sub_with_object": { "field": "hello" } }`},
 				{Data: `{ "sub_with_object": { "field": "bye" } }`},
+				{Data: `{ "sub_with_object": { "field": null } }`},
 			},
 		},
 
@@ -196,60 +200,28 @@ func TestSchemaSubscribe(t *testing.T) {
 				},
 			},
 		},
-		// {
-		// 	Name:   "subscription_resolver_can_error_optional_msg",
-		// 	Schema: schema,
-		// 	Query: `
-		// 		subscription onHelloSaid {
-		// 			helloSaidNullable {
-		// 				msg
-		// 			}
-		// 		}
-		// 	`,
-		// 	ExpectedResults: []testutil.TestResponse{
-		// 		{
-		// 			Data: json.RawMessage(`
-		// 				{
-		// 					"helloSaidNullable": {
-		// 						"msg": null
-		// 					}
-		// 				}
-		// 			`),
-		// 			Errors: []gqlerrors.FormattedError{{Message: ""}}},
-		// 	},
-		// },
-		// {
-		// 	Name:   "subscription_resolver_can_error_optional_event",
-		// 	Schema: schema,
-		// 	Query: `
-		// 		subscription onHelloSaid {
-		// 			helloSaidNullable {
-		// 				msg
-		// 			}
-		// 		}
-		// 	`,
-		// 	ExpectedResults: []testutil.TestResponse{
-		// 		{
-		// 			Data: json.RawMessage(`
-		// 				{
-		// 					"helloSaidNullable": null
-		// 				}
-		// 			`),
-		// 			Errors: []gqlerrors.FormattedError{{Message: ""}}},
-		// 	},
-		// },
-		// {
-		// 	Name:   "schema_without_resolver_errors",
-		// 	Schema: schema,
-		// 	Query: `
-		// 		subscription onHelloSaid {
-		// 			helloSaid {
-		// 				msg
-		// 			}
-		// 		}
-		// 	`,
-		// 	ExpectedErr: errors.New("schema created without resolver, can not subscribe"),
-		// },
+
+		{
+			Name: "schema_without_subscribe_errors",
+			Schema: makeSubscriptionSchema(t, graphql.ObjectConfig{
+				Name: "Subscription",
+				Fields: graphql.Fields{
+					"should_error": &graphql.Field{
+						Type: graphql.String,
+					},
+				},
+			}),
+			Query: `
+				subscription {
+					should_error
+				}
+			`,
+			ExpectedResults: []testutil.TestResponse{
+				{
+					Errors: []string{"the subscription function \"should_error\" is not defined"},
+				},
+			},
+		},
 	})
 }