Add tests for GraphiQL

Tobias Fuhrimann · Tobias Fuhrimann · commit 70ee617a8078 · 2017-08-27T13:21:36.000+02:00
diff --git a/graphiql.go b/graphiql.go
@@ -39,6 +39,10 @@ func renderGraphiQL(w http.ResponseWriter, params graphql.Params) {
 
 	// Create result string
 	result, err := json.MarshalIndent(graphql.Do(params), "", "  ")
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
 	resString := string(result)
 
 	p := graphiqlPage{
diff --git a/graphiql_test.go b/graphiql_test.go
@@ -0,0 +1,77 @@
+package handler_test
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/graphql-go/graphql/testutil"
+	"github.com/graphql-go/handler"
+)
+
+func TestRenderGraphiQL(t *testing.T) {
+	cases := map[string]struct {
+		graphiqlEnabled      bool
+		accept               string
+		expectedStatusCode   int
+		expectedContentType  string
+		expectedBodyContains string
+	}{
+		"renders GraphiQL": {
+			graphiqlEnabled:      true,
+			accept:               "text/html",
+			expectedStatusCode:   http.StatusOK,
+			expectedContentType:  "text/html; charset=utf-8",
+			expectedBodyContains: "<!DOCTYPE html>",
+		},
+		"doesn't render graphiQL if turned off": {
+			graphiqlEnabled:     false,
+			accept:              "text/html",
+			expectedStatusCode:  http.StatusOK,
+			expectedContentType: "application/json; charset=utf-8",
+		},
+		"doesn't render GraphiQL if Content-Type application/json is present": {
+			graphiqlEnabled:     true,
+			accept:              "application/json,text/html",
+			expectedStatusCode:  http.StatusOK,
+			expectedContentType: "application/json; charset=utf-8",
+		},
+	}
+
+	for tcID, tc := range cases {
+		t.Run(tcID, func(t *testing.T) {
+			req, err := http.NewRequest(http.MethodGet, "", nil)
+			if err != nil {
+				t.Error(err)
+			}
+
+			req.Header.Set("Accept", tc.accept)
+
+			h := handler.New(&handler.Config{
+				Schema:   &testutil.StarWarsSchema,
+				GraphiQL: tc.graphiqlEnabled,
+			})
+
+			rr := httptest.NewRecorder()
+
+			h.ServeHTTP(rr, req)
+			resp := rr.Result()
+
+			statusCode := resp.StatusCode
+			if statusCode != tc.expectedStatusCode {
+				t.Fatalf("%s: wrong status code, expected %v, got %v", tcID, tc.expectedStatusCode, statusCode)
+			}
+
+			contentType := resp.Header.Get("Content-Type")
+			if contentType != tc.expectedContentType {
+				t.Fatalf("%s: wrong content type, expected %s, got %s", tcID, tc.expectedContentType, contentType)
+			}
+
+			body := rr.Body.String()
+			if !strings.Contains(body, tc.expectedBodyContains) {
+				t.Fatalf("%s: wrong body, expected %s to contain %s", tcID, body, tc.expectedBodyContains)
+			}
+		})
+	}
+}
diff --git a/handler.go b/handler.go
@@ -139,7 +139,7 @@ func (h *Handler) ContextHandler(ctx context.Context, w http.ResponseWriter, r *
 	}
 
 	// use proper JSON Header
-	w.Header().Add("Content-Type", "application/json")
+	w.Header().Add("Content-Type", "application/json; charset=utf-8")
 
 	if h.pretty {
 		w.WriteHeader(http.StatusOK)

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func (h Handler) ContextHandler(ctx context.Context, w http.ResponseWriter, r `
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`// use proper JSON Header`
`142`		`- w.Header().Add("Content-Type", "application/json")`
	`142`	`+ w.Header().Add("Content-Type", "application/json; charset=utf-8")`
`143`	`143`
`144`	`144`	`if h.pretty {`
`145`	`145`	`w.WriteHeader(http.StatusOK)`