Fix test which broke and add new once

Author: Emil Pirfält

handlerfunc/adapter.go

@@ -9,12 +9,18 @@ import (
 
 type HandlerFuncAdapter struct {
 	core.RequestAccessor
-	handlerFunc http.Handler
+	handler http.Handler
 }
 
-func New(handler http.Handler) *HandlerFuncAdapter {
+func New(handlerFunc http.HandlerFunc) *HandlerFuncAdapter {
 	return &HandlerFuncAdapter{
-		handlerFunc: handler,
+		handler: handlerFunc,
+	}
+}
+
+func NewHandler(handler http.Handler) *HandlerFuncAdapter {
+	return &HandlerFuncAdapter{
+		handler: handler,
 	}
 }
 
@@ -25,7 +31,7 @@ func (h *HandlerFuncAdapter) Proxy(event events.APIGatewayProxyRequest) (events.
 	}
 
 	w := core.NewProxyResponseWriter()
-	h.handlerFunc.ServeHTTP(http.ResponseWriter(w), req)
+	h.handler.ServeHTTP(http.ResponseWriter(w), req)
 
 	resp, err := w.GetProxyResponse()
 	if err != nil {

handlerfunc/adapter_test.go

@@ -12,17 +12,42 @@ import (
 	. "github.com/onsi/gomega"
 )
 
+type handler struct{}
+
+func (h handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	w.Header().Add("unfortunately-required-header", "")
+	fmt.Fprintf(w, "Go Lambda!!")
+}
+
 var _ = Describe("HandlerFuncAdapter tests", func() {
-	Context("Simple ping request", func() {
+	Context("Simple ping request, HandlerFunc", func() {
 		It("Proxies the event correctly", func() {
 			log.Println("Starting test")
 
-			handler := func(w http.ResponseWriter, req *http.Request) {
+			handlerFunc := func(w http.ResponseWriter, req *http.Request) {
 				w.Header().Add("unfortunately-required-header", "")
 				fmt.Fprintf(w, "Go Lambda!!")
 			}
 
-			adapter := handlerfunc.New(handler)
+			adapter := handlerfunc.New(handlerFunc)
+
+			req := events.APIGatewayProxyRequest{
+				Path:       "/ping",
+				HTTPMethod: "GET",
+			}
+
+			resp, err := adapter.Proxy(req)
+
+			Expect(err).To(BeNil())
+			Expect(resp.StatusCode).To(Equal(200))
+		})
+	})
+
+	Context("Simple ping request, Handler", func() {
+		It("Proxies the event correctly", func() {
+			log.Println("Starting test")
+
+			adapter := handlerfunc.NewHandler(handler{})
 
 			req := events.APIGatewayProxyRequest{
 				Path:       "/ping",