added t.Helper() to show failing test instead of httpmocklib

Author: Sapexoid

httpmockserver.go

@@ -69,13 +69,15 @@ func New(t T) MockServer {
 }
 
 type T interface {
+	Helper()
 	Fatal(args ...interface{})
 	Fatalf(format string, args ...interface{})
 	Errorf(format string, args ...interface{})
 }
 
 // NewWithOpts can be used to create a mock server with custom options
 func NewWithOpts(t T, opts Opts) MockServer {
+	t.Helper()
 	err := opts.validate()
 	if err != nil {
 		t.Fatalf("invalid options: %v", err)
@@ -140,6 +142,7 @@ func (s *mockServer) BaseURL() string {
 }
 
 func (s *mockServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	s.t.Helper()
 	s.handlerMutex.Lock()
 	defer s.handlerMutex.Unlock()
 
@@ -259,6 +262,7 @@ func (s *mockServer) DEFAULT() RequestExpectation {
 }
 
 func (s *mockServer) AssertExpectations() {
+	s.t.Helper()
 	s.finisheCalled = true
 	var buf bytes.Buffer
 

httpmockserver_test.go

@@ -922,3 +922,6 @@ func (t *TMock) Fatalf(format string, args ...interface{}) {
 func (t *TMock) Errorf(format string, args ...interface{}) {
 	t.Called(format, args)
 }
+
+func (t *TMock) Helper() {
+}

request_expectation.go

@@ -422,7 +422,7 @@ func (exp *requestExpectation) Custom(validation RequestValidationFunc, descript
 }
 
 func (exp *requestExpectation) Response(code int) ResponseExpectation {
-
+	exp.t.Helper()
 	if exp.every {
 		exp.t.Fatalf("Every is used to check conditions on every request, therefore it cannot be used with Response()")
 		return nil

response_expectation.go

@@ -48,6 +48,7 @@ func (exp *responseExpectation) StringBody(body string) ResponseExpectation {
 // JsonBody sets the body of the response to the given object (e.g. `{"foo":"bar"}` or map[string]string{"foo":"bar"})
 // you may provide a go object or a valid json string
 func (exp *responseExpectation) JsonBody(object interface{}) ResponseExpectation {
+	exp.t.Helper()
 	if object == nil {
 		return exp.Body(nil)
 	}