More coverage updates

Author: David Koblas

handler.go

@@ -148,15 +148,17 @@ func NewRequestOptions(r *http.Request, maxMemory int64) *RequestOptions {
 							if vv == "variables" {
 								node = opts.Variables
 							} else {
-								panic("Invalid top level tag")
+								// panic("Invalid top level tag")
+								return &RequestOptions{}
 							}
 						case map[string]interface{}:
 							node = node.(map[string]interface{})[vv]
 						case []interface{}:
 							if idx, err := strconv.ParseInt(vv, 10, 64); err == nil {
 								node = node.([]interface{})[idx]
 							} else {
-								panic("Unable to lookup index")
+								// panic("Unable to lookup index")
+								return &RequestOptions{}
 							}
 						default:
 							panic(fmt.Errorf("Unknown type %T", node))
@@ -172,10 +174,12 @@ func NewRequestOptions(r *http.Request, maxMemory int64) *RequestOptions {
 						if idx, err := strconv.ParseInt(last, 10, 64); err == nil {
 							node.([]interface{})[idx] = data
 						} else {
-							panic("Unable to lookup index")
+							// panic("Unable to lookup index")
+							return &RequestOptions{}
 						}
 					default:
-						panic(fmt.Errorf("Unknown last type %T", node))
+						// panic(fmt.Errorf("Unknown last type %T", node))
+						return &RequestOptions{}
 					}
 				}
 			}

handler_test.go

@@ -312,6 +312,43 @@ func TestHandler_Multipart_Basic_ErrBadMap(t *testing.T) {
 	}
 }
 
+func TestHandler_Multipart_Basic_ErrBadMapRoot(t *testing.T) {
+	body := &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
+
+	queryString := `{
+        "query":"query HeroNameQuery { hero { name } }",
+        "variables":{"file":null}
+    }`
+
+	writer.WriteField("operations", queryString)
+	writer.WriteField("map", `{"0":["xxx.file"]}`)
+	part, _ := writer.CreateFormFile("0", "test.txt")
+
+	if _, err := io.Copy(part, strings.NewReader("How now brown cow")); err != nil {
+		t.Fatalf("unexpected copy writer fail %v", err)
+	}
+
+	err := writer.Close()
+	if err != nil {
+		t.Fatalf("unexpected writer fail %v", err)
+	}
+
+	req, err := http.NewRequest("POST", "/graphql", body)
+	req.Header.Set("Content-Type", writer.FormDataContentType())
+
+	h := handler.New(&handler.Config{
+		Schema: &testutil.StarWarsSchema,
+	})
+	result, resp := executeTest(t, h, req)
+	if resp.Code != http.StatusOK {
+		t.Fatalf("unexpected server response %v", resp.Code)
+	}
+	if len(result.Errors) != 1 || result.Errors[0].Message != "Must provide an operation." {
+		t.Fatalf("unexpected response %+v", result)
+	}
+}
+
 func TestHandler_Multipart_Basic_Upload(t *testing.T) {
 	expected := &graphql.Result{
 		Data: map[string]interface{}{
@@ -359,3 +396,56 @@ func TestHandler_Multipart_Basic_Upload(t *testing.T) {
 		t.Fatalf("wrong result, graphql result diff: %v", testutil.Diff(expected, result))
 	}
 }
+
+func TestHandler_Multipart_Basic_UploadSlice(t *testing.T) {
+	expected := &graphql.Result{
+		Data: map[string]interface{}{
+			"hero": map[string]interface{}{
+				"name": "R2-D2",
+			},
+		},
+	}
+
+	body := &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
+
+	queryString := `{
+		"query":"query HeroNameQuery { hero { name } }",
+		"variables":{"file":[null,null]}
+	}`
+
+	writer.WriteField("operations", queryString)
+	writer.WriteField("map", `{"0":["variables.file.0"],"1":["variables.file.1"]}`)
+
+	part1, _ := writer.CreateFormFile("0", "test.txt")
+	if _, err := io.Copy(part1, strings.NewReader("How now brown cow")); err != nil {
+		t.Fatalf("unexpected copy writer fail %v", err)
+	}
+
+	part2, _ := writer.CreateFormFile("1", "test.txt")
+	if _, err := io.Copy(part2, strings.NewReader("How now gold fish")); err != nil {
+		t.Fatalf("unexpected copy writer fail %v", err)
+	}
+
+	err := writer.Close()
+	if err != nil {
+		t.Fatalf("unexpected writer fail %v", err)
+	}
+
+	req, err := http.NewRequest("POST", "/graphql", body)
+	req.Header.Set("Content-Type", writer.FormDataContentType())
+
+	h := handler.New(&handler.Config{
+		Schema: &testutil.StarWarsSchema,
+	})
+	result, resp := executeTest(t, h, req)
+	if resp.Code != http.StatusOK {
+		t.Fatalf("unexpected server response %v", resp.Code)
+	}
+	if resp.Code != http.StatusOK {
+		t.Fatalf("unexpected server response %v", resp.Code)
+	}
+	if !reflect.DeepEqual(result, expected) {
+		t.Fatalf("wrong result, graphql result diff: %v", testutil.Diff(expected, result))
+	}
+}