From 496e6fd03a085827a2b90c365fdb11ed5a68853a Mon Sep 17 00:00:00 2001 From: Michael Captain Date: Wed, 7 Jul 2021 15:02:40 +0300 Subject: [PATCH] Call Verify GHTTPWithGomega receiver funcs (#454) --- ghttp/handlers.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ghttp/handlers.go b/ghttp/handlers.go index efb96a25e..99a25bf5d 100644 --- a/ghttp/handlers.go +++ b/ghttp/handlers.go @@ -109,7 +109,7 @@ func (g GHTTPWithGomega) VerifyHeader(header http.Header) http.HandlerFunc { //(recall that a `http.Header` is a mapping from string (key) to []string (values)) //It is a convenience wrapper around `VerifyHeader` that allows you to avoid having to create an `http.Header` object. func (g GHTTPWithGomega) VerifyHeaderKV(key string, values ...string) http.HandlerFunc { - return VerifyHeader(http.Header{key: values}) + return g.VerifyHeader(http.Header{key: values}) } //VerifyBody returns a handler that verifies that the body of the request matches the passed in byte array. @@ -131,7 +131,7 @@ func (g GHTTPWithGomega) VerifyBody(expectedBody []byte) http.HandlerFunc { //VerifyJSON also verifies that the request's content type is application/json func (g GHTTPWithGomega) VerifyJSON(expectedJSON string) http.HandlerFunc { return CombineHandlers( - VerifyMimeType("application/json"), + g.VerifyMimeType("application/json"), func(w http.ResponseWriter, req *http.Request) { body, err := ioutil.ReadAll(req.Body) req.Body.Close() @@ -148,8 +148,8 @@ func (g GHTTPWithGomega) VerifyJSONRepresenting(object interface{}) http.Handler data, err := json.Marshal(object) g.gomega.Expect(err).ShouldNot(HaveOccurred()) return CombineHandlers( - VerifyMimeType("application/json"), - VerifyJSON(string(data)), + g.VerifyMimeType("application/json"), + g.VerifyJSON(string(data)), ) } @@ -171,7 +171,7 @@ func (g GHTTPWithGomega) VerifyForm(values url.Values) http.HandlerFunc { // //It is a convenience wrapper around `VerifyForm` that lets you avoid having to create a `url.Values` object. func (g GHTTPWithGomega) VerifyFormKV(key string, values ...string) http.HandlerFunc { - return VerifyForm(url.Values{key: values}) + return g.VerifyForm(url.Values{key: values}) } //VerifyProtoRepresenting returns a handler that verifies that the body of the request is a valid protobuf @@ -180,7 +180,7 @@ func (g GHTTPWithGomega) VerifyFormKV(key string, values ...string) http.Handler //VerifyProtoRepresenting also verifies that the request's content type is application/x-protobuf func (g GHTTPWithGomega) VerifyProtoRepresenting(expected proto.Message) http.HandlerFunc { return CombineHandlers( - VerifyContentType("application/x-protobuf"), + g.VerifyContentType("application/x-protobuf"), func(w http.ResponseWriter, req *http.Request) { body, err := ioutil.ReadAll(req.Body) g.gomega.Expect(err).ShouldNot(HaveOccurred())