Merge pull request #1423 from stretchr/add-Helper-method-in-tests

Add Helper() method in internal mocks and assert.CollectT

Author: brackendawson

assert/assertions.go

@@ -2008,6 +2008,9 @@ type CollectT struct {
 	errors []error
 }
 
+// Helper is like [testing.T.Helper] but does nothing.
+func (CollectT) Helper() {}
+
 // Errorf collects the error.
 func (c *CollectT) Errorf(format string, args ...interface{}) {
 	c.errors = append(c.errors, fmt.Errorf(format, args...))

assert/assertions_test.go

@@ -745,6 +745,9 @@ type bufferT struct {
 	buf bytes.Buffer
 }
 
+// Helper is like [testing.T.Helper] but does nothing.
+func (bufferT) Helper() {}
+
 func (t *bufferT) Errorf(format string, args ...interface{}) {
 	// implementation of decorate is copied from testing.T
 	decorate := func(s string) string {
@@ -2791,6 +2794,9 @@ type mockTestingT struct {
 	args     []interface{}
 }
 
+// Helper is like [testing.T.Helper] but does nothing.
+func (mockTestingT) Helper() {}
+
 func (m *mockTestingT) errorString() string {
 	return fmt.Sprintf(m.errorFmt, m.args...)
 }
@@ -2816,6 +2822,9 @@ func TestFailNowWithPlainTestingT(t *testing.T) {
 
 type mockFailNowTestingT struct{}
 
+// Helper is like [testing.T.Helper] but does nothing.
+func (mockFailNowTestingT) Helper() {}
+
 func (m *mockFailNowTestingT) Errorf(format string, args ...interface{}) {}
 
 func (m *mockFailNowTestingT) FailNow() {}
@@ -3141,12 +3150,13 @@ type errorsCapturingT struct {
 	errors []error
 }
 
+// Helper is like [testing.T.Helper] but does nothing.
+func (errorsCapturingT) Helper() {}
+
 func (t *errorsCapturingT) Errorf(format string, args ...interface{}) {
 	t.errors = append(t.errors, fmt.Errorf(format, args...))
 }
 
-func (t *errorsCapturingT) Helper() {}
-
 func TestEventuallyWithTFalse(t *testing.T) {
 	t.Parallel()
 
@@ -3393,6 +3403,9 @@ type captureTestingT struct {
 	msg    string
 }
 
+// Helper is like [testing.T.Helper] but does nothing.
+func (captureTestingT) Helper() {}
+
 func (ctt *captureTestingT) Errorf(format string, args ...interface{}) {
 	ctt.msg = fmt.Sprintf(format, args...)
 	ctt.failed = true

mock/mock_test.go

@@ -132,6 +132,9 @@ type MockTestingT struct {
 	logfCount, errorfCount, failNowCount int
 }
 
+// Helper is like [testing.T.Helper] but does nothing.
+func (MockTestingT) Helper() {}
+
 const mockTestingTFailNowCalled = "FailNow was called"
 
 func (m *MockTestingT) Logf(string, ...interface{}) {

require/requirements_test.go

@@ -29,6 +29,9 @@ type MockT struct {
 	Failed bool
 }
 
+// Helper is like [testing.T.Helper] but does nothing.
+func (MockT) Helper() {}
+
 func (t *MockT) FailNow() {
 	t.Failed = true
 }