Merge pull request #71 from programmfabrik/dont_overwrite_format_with…

…_unset don't overwrite format if unset (see #63710)
programmfabrik · Feb 10, 2022 · c97252d · c97252d
2 parents 1cc6ee0 + 65cb10e
commit c97252d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/api_testcase.go b/api_testcase.go
@@ -138,7 +138,11 @@ func (testCase Case) breakResponseIsPresent(request api.Request, response api.Re
 				return false, fmt.Errorf("error loading check response from spec: %s", err)
 			}
 
-			response.Format = expectedResponse.Format
+			if expectedResponse.Format.Type != "" {
+				response.Format = expectedResponse.Format
+			} else {
+				expectedResponse.Format = response.Format
+			}
 
 			responsesMatch, err := testCase.responsesEqual(expectedResponse, response)
 			if err != nil {
@@ -192,7 +196,11 @@ func (testCase *Case) checkCollectResponse(request api.Request, response api.Res
 				return -1, fmt.Errorf("error loading check response from spec: %s", err)
 			}
 
-			response.Format = expectedResponse.Format
+			if expectedResponse.Format.Type != "" {
+				response.Format = expectedResponse.Format
+			} else {
+				expectedResponse.Format = response.Format
+			}
 
 			responsesMatch, err := testCase.responsesEqual(expectedResponse, response)
 			if err != nil {