fix(webhook): Fix response content type

tommy351 · Dec 16, 2020 · 03c04c6 · 03c04c6
1 parent 280cbeb
commit 03c04c6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/internal/httputil/response.go b/internal/httputil/response.go
@@ -42,8 +42,8 @@ func NoContent(w http.ResponseWriter) error {
 }
 
 func JSON(w http.ResponseWriter, status int, data interface{}) error {
-	w.WriteHeader(status)
 	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(status)
 
 	if err := json.NewEncoder(w).Encode(data); err != nil {
 		return fmt.Errorf("failed to write json to http response: %w", err)

diff --git a/test/e2e/github_webhook_test.go b/test/e2e/github_webhook_test.go
@@ -12,6 +12,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/tommy351/pullup/internal/fakegithub"
+	"github.com/tommy351/pullup/internal/testutil"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -28,7 +29,10 @@ func sendGitHubRequest(event string, data interface{}) {
 		req.Header.Set("X-GitHub-Event", event)
 
 		return http.DefaultClient.Do(req)
-	}).Should(HaveHTTPStatus(http.StatusOK))
+	}).Should(And(
+		HaveHTTPStatus(http.StatusOK),
+		testutil.HaveHTTPHeader("Content-Type", "application/json"),
+	))
 }
 
 var _ = Describe("GitHubWebhook", func() {

diff --git a/test/e2e/http_webhook_test.go b/test/e2e/http_webhook_test.go
@@ -9,6 +9,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/tommy351/pullup/internal/testutil"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/rand"
 )
@@ -40,8 +41,8 @@ var _ = Describe("HTTPWebhook", func() {
 
 			return http.DefaultClient.Do(req)
 		}).Should(And(
-			Not(BeNil()),
 			HaveHTTPStatus(http.StatusOK),
+			testutil.HaveHTTPHeader("Content-Type", "application/json"),
 		))
 	}