Merge pull request #21 from twharmon/content-type-json

Content type json
twharmon · Aug 24, 2022 · d0867df · d0867df
2 parents 9c7bbac + e17cffc
commit d0867df
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/context.go b/context.go
@@ -61,7 +61,12 @@ func (c *handlerContext) Request() Request {
 }
 
 func (c *handlerContext) Response(status int, body ...interface{}) Responder {
-	r := response{status: status}
+	r := response{
+		status: status,
+		headers: map[string]string{
+			"content-type": "application/json",
+		},
+	}
 	if len(body) > 0 {
 		r.body = body[0]
 	}

diff --git a/golamb_test.go b/golamb_test.go
@@ -30,6 +30,7 @@ func TestGetHandler(t *testing.T) {
 	}
 	want := events.APIGatewayV2HTTPResponse{
 		StatusCode: http.StatusOK,
+		Headers:    map[string]string{"content-type": "application/json"},
 	}
 	if !reflect.DeepEqual(want, got) {
 		t.Fatalf("want %v; got %v", want, got)
@@ -59,6 +60,7 @@ func TestPanicHandler(t *testing.T) {
 	}
 	want := &events.APIGatewayV2HTTPResponse{
 		StatusCode: http.StatusInternalServerError,
+		Headers:    map[string]string{"content-type": "application/json"},
 	}
 	if !reflect.DeepEqual(want, got) {
 		t.Fatalf("want %v; got %v", want, got)

diff --git a/response.go b/response.go
@@ -44,9 +44,6 @@ func (r *response) Respond() (*events.APIGatewayV2HTTPResponse, error) {
 }
 
 func (r *response) SetHeader(key string, value string) Responder {
-	if r.headers == nil {
-		r.headers = make(map[string]string)
-	}
 	r.headers[key] = value
 	return r
 }

diff --git a/response_test.go b/response_test.go
@@ -18,6 +18,7 @@ func TestResponseOKEmpty(t *testing.T) {
 	}
 	want := &events.APIGatewayV2HTTPResponse{
 		StatusCode: http.StatusOK,
+		Headers:    map[string]string{"content-type": "application/json"},
 	}
 	if !reflect.DeepEqual(want, got) {
 		t.Fatalf("want %v; got %v", want, got)
@@ -35,6 +36,7 @@ func TestResponseOKBody(t *testing.T) {
 	want := &events.APIGatewayV2HTTPResponse{
 		StatusCode: http.StatusOK,
 		Body:       `{"foo":"bar"}`,
+		Headers:    map[string]string{"content-type": "application/json"},
 	}
 	if !reflect.DeepEqual(want, got) {
 		t.Fatalf("want %v; got %v", want, got)
@@ -51,7 +53,10 @@ func TestResponseOKHeader(t *testing.T) {
 	}
 	want := &events.APIGatewayV2HTTPResponse{
 		StatusCode: http.StatusOK,
-		Headers:    map[string]string{"foo": "bar"},
+		Headers: map[string]string{
+			"foo":          "bar",
+			"content-type": "application/json",
+		},
 	}
 	if !reflect.DeepEqual(want, got) {
 		t.Fatalf("want %v; got %v", want, got)
@@ -69,6 +74,7 @@ func TestResponseOKCookie(t *testing.T) {
 	want := &events.APIGatewayV2HTTPResponse{
 		StatusCode: http.StatusOK,
 		Cookies:    []string{"foo=bar"},
+		Headers:    map[string]string{"content-type": "application/json"},
 	}
 	if !reflect.DeepEqual(want, got) {
 		t.Fatalf("want %v; got %v", want, got)