fix an error handling bug

99designs · Feb 11, 2018 · 261b52c · 261b52c
1 parent 1da57f5
commit 261b52c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/client/client.go b/client/client.go
@@ -9,6 +9,7 @@ import (
 	"net/http"
 
 	"github.com/mitchellh/mapstructure"
+	"github.com/vektah/gqlgen/neelance/errors"
 )
 
 // Client for graphql requests
@@ -102,8 +103,8 @@ func (p *Client) Post(query string, response interface{}, options ...Option) err
 	}
 
 	respData := struct {
-		Data   interface{}     `json:"data"`
-		Errors json.RawMessage `json:"errors"`
+		Data   interface{}          `json:"data"`
+		Errors []*errors.QueryError `json:"errors"`
 	}{
 		Data: response,
 	}

diff --git a/example/todo/todo_test.go b/example/todo/todo_test.go
@@ -53,6 +53,16 @@ func TestTodo(t *testing.T) {
 		require.Equal(t, "t2", resp.B.ID)
 	})
 
+	t.Run("find a missing todo", func(t *testing.T) {
+		var resp struct {
+			Todo *struct{ Text string }
+		}
+		err := c.Post(`{ todo(id:99) { text } }`, &resp)
+
+		require.Error(t, err)
+		require.Nil(t, resp.Todo)
+	})
+
 	t.Run("select all", func(t *testing.T) {
 		var resp struct {
 			Todo struct {

diff --git a/neelance/errors/errors.go b/neelance/errors/errors.go
@@ -79,6 +79,7 @@ func ErrorWriter(errs []*QueryError) jsonw.Writer {
 
 			errObj.Add("locations", locations)
 		}
+		res = append(res, errObj)
 	}
 
 	return res
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,7 @@ func ErrorWriter(errs []*QueryError) jsonw.Writer { @@
     			errObj.Add("locations", locations)
     		}
+    		res = append(res, errObj)
     	}
     	return res
@@ Expand Down @@