Only say another call if it has been called before

stretchr · Jul 26, 2021 · ab301b7 · ab301b7
1 parent bd7b872
commit ab301b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mock/mock.go b/mock/mock.go
@@ -457,7 +457,7 @@ func (m *Mock) MethodCalled(methodName string, arguments ...interface{}) Argumen
 			m.fail("mock: Unexpected Method Call\n-----------------------------\n\n%s\n\nMust not be called before%s:\n\n%s",
 				callString(call.Method, call.Arguments, true),
 				func() (s string) {
-					if requirement.Repeatability+requirement.totalCalls > 1 {
+					if requirement.totalCalls > 0 {
 						s = " another call of"
 					}
 					if call.Parent != requirement.Parent {

diff --git a/mock/mock_test.go b/mock/mock_test.go
@@ -738,7 +738,7 @@ func Test_Mock_Return_NotBefore_Out_Of_Order(t *testing.T) {
 
 	b := mockedService.
 		On("TheExampleMethod", 1, 2, 3).
-		Return(4, nil)
+		Return(4, nil).Twice()
 	c := mockedService.
 		On("TheExampleMethod2", true).
 		Return().