Fix incorrect order of 'expected' and 'actual' when diffing failing mocks

Stein Fletcher · Stein Fletcher · commit c4d8b6107cd6 · 2021-02-23T22:13:55.000Z
diff --git a/mocks.go b/mocks.go
@@ -1030,10 +1030,10 @@ var bodyMatcher = func(req *http.Request, spec *MockRequest) error {
 	}
 
 	if isJSON {
-		return fmt.Errorf("received body did not match expected mock body\n%s", diff(reqJSON, matchJSON))
+		return fmt.Errorf("received body did not match expected mock body\n%s", diff(matchJSON, reqJSON))
 	}
 
-	return fmt.Errorf("received body did not match expected mock body\n%s", diff(bodyStr, mockBody))
+	return fmt.Errorf("received body did not match expected mock body\n%s", diff(mockBody, bodyStr))
 }
 
 func errorOrNil(statement bool, errorMessage func() string) error {

Original file line number	Diff line number	Diff line change
`@@ -1030,10 +1030,10 @@ var bodyMatcher = func(req http.Request, spec MockRequest) error {`
`1030`	`1030`	`}`
`1031`	`1031`
`1032`	`1032`	`if isJSON {`
`1033`		`- return fmt.Errorf("received body did not match expected mock body\n%s", diff(reqJSON, matchJSON))`
	`1033`	`+ return fmt.Errorf("received body did not match expected mock body\n%s", diff(matchJSON, reqJSON))`
`1034`	`1034`	`}`
`1035`	`1035`
`1036`		`- return fmt.Errorf("received body did not match expected mock body\n%s", diff(bodyStr, mockBody))`
	`1036`	`+ return fmt.Errorf("received body did not match expected mock body\n%s", diff(mockBody, bodyStr))`
`1037`	`1037`	`}`
`1038`	`1038`
`1039`	`1039`	`func errorOrNil(statement bool, errorMessage func() string) error {`