initial tests pass

Author: remorses

subscription.go

@@ -110,6 +110,7 @@ func ExecuteSubscription(p ExecuteParams) chan *Result {
 			if err := recover(); err != nil {
 				e, ok := err.(error)
 				if !ok {
+					fmt.Println("strange program path")
 					return
 				}
 				sendOneResultandClose(&Result{
@@ -217,16 +218,17 @@ func ExecuteSubscription(p ExecuteParams) chan *Result {
 		switch fieldResult.(type) {
 		case chan interface{}:
 			sub := fieldResult.(chan interface{})
-			defer close(resultChannel)
 			for {
 				select {
 				case <-p.Context.Done():
 					println("context cancelled")
+					close(resultChannel)
 					// TODO send the context error to the resultchannel
 					return
 
 				case res, more := <-sub:
 					if !more {
+						close(resultChannel)
 						return
 					}
 					resultChannel <- mapSourceToResponse(res)

subscription_test.go

@@ -66,7 +66,7 @@ func TestSchemaSubscribe(t *testing.T) {
 					"sub_without_resolver": &graphql.Field{
 						Type:      graphql.String,
 						Subscribe: makeSubscribeToStringFunction([]string{"a", "b", "c"}),
-						Resolve: func(p graphql.ResolveParams) (interface{}, error) {
+						Resolve: func(p graphql.ResolveParams) (interface{}, error) { // TODO remove dummy resolver
 							return p.Source, nil
 						},
 					},
@@ -108,44 +108,46 @@ func TestSchemaSubscribe(t *testing.T) {
 				{Data: `{ "sub_with_resolver": "result=c" }`},
 			},
 		},
-		// {
-		// 	Name: "subscribe to a nested object",
-		// 	Schema: makeSubscriptionSchema(t, graphql.ObjectConfig{
-		// 		Name: "Subscription",
-		// 		Fields: graphql.Fields{
-		// 			"sub_with_object": &graphql.Field{
-		// 				Type: graphql.String,
-		// 				Subscribe: makeSubscribeToMapFunction([]map[string]interface{}{
-		// 					{
-		// 						"field": "hello",
-		// 						"obj": map[string]interface{}{
-		// 							"field": "hello",
-		// 						},
-		// 					},
-		// 					{
-		// 						"field": "bye",
-		// 						"obj": map[string]interface{}{
-		// 							"field": "bye",
-		// 						},
-		// 					},
-		// 				}),
-		// 			},
-		// 		},
-		// 	}),
-		// 	Query: `
-		// 		subscription onHelloSaid {
-		// 			sub_with_object {
-		// 				field
-		// 				obj {
-		// 					field
-		// 				}
-		// 			}
-		// 		}
-		// 	`,
-		// 	ExpectedResults: []testutil.TestResponse{
-		// 		{Data: `{ "sub_with_object": { "field": "hello", "obj": { "field": "hello" } } }`},
-		// 	},
-		// },
+		{
+			Name: "subscribe to a nested object",
+			Schema: makeSubscriptionSchema(t, graphql.ObjectConfig{
+				Name: "Subscription",
+				Fields: graphql.Fields{
+					"sub_with_object": &graphql.Field{
+						Type: graphql.NewObject(graphql.ObjectConfig{
+							Name: "Obj",
+							Fields: graphql.Fields{
+								"field": &graphql.Field{
+									Type: graphql.String,
+								},
+							},
+						}),
+						Resolve: func(p graphql.ResolveParams) (interface{}, error) { // TODO remove dummy resolver
+							return p.Source, nil
+						},
+						Subscribe: makeSubscribeToMapFunction([]map[string]interface{}{
+							{
+								"field": "hello",
+							},
+							{
+								"field": "bye",
+							},
+						}),
+					},
+				},
+			}),
+			Query: `
+				subscription onHelloSaid {
+					sub_with_object {
+						field
+					}
+				}
+			`,
+			ExpectedResults: []testutil.TestResponse{
+				{Data: `{ "sub_with_object": { "field": "hello" } }`},
+				{Data: `{ "sub_with_object": { "field": "bye" } }`},
+			},
+		},
 
 		// {
 		// 	Name:   "parse_errors",

testutil/subscription.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"strconv"
 	"testing"
 
@@ -65,7 +64,7 @@ func RunSubscribe(t *testing.T, test *TestSubscription) {
 
 	var results []*graphql.Result
 	for res := range c {
-		fmt.Println(res)
+		println(pretty(res))
 		results = append(results, res)
 	}
 
@@ -139,3 +138,11 @@ func formatJSON(data string) ([]byte, error) {
 	}
 	return formatted, nil
 }
+
+func pretty(x interface{}) string {
+	got, err := json.MarshalIndent(x, "", "  ")
+	if err != nil {
+		panic(err)
+	}
+	return string(got)
+}