From 00c899a0bb650c2f3e9f9404242e520256e7b4e9 Mon Sep 17 00:00:00 2001 From: miledxz Date: Sun, 16 Feb 2025 11:55:45 +0100 Subject: [PATCH] adding simplified http response assertion --- tests/suite/graceful_recovery_test.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/suite/graceful_recovery_test.go b/tests/suite/graceful_recovery_test.go index 33c3c447d0..a9392f4bc7 100644 --- a/tests/suite/graceful_recovery_test.go +++ b/tests/suite/graceful_recovery_test.go @@ -293,18 +293,16 @@ func checkForFailingTraffic(teaURL, coffeeURL string) error { return nil } -func expectRequestToSucceed(appURL, address string, responseBodyMessage string) error { +func expectRequestToSucceed(appURL, address, responseBodyMessage string) error { status, body, err := framework.Get(appURL, address, timeoutConfig.RequestTimeout, nil, nil) - - if status != http.StatusOK { - return errors.New("http status was not 200") + if err != nil { + return err } - if !strings.Contains(body, responseBodyMessage) { - return errors.New("expected response body to contain correct body message") - } + Expect(status).To(HaveHTTPStatus(http.StatusOK), "http status was not 200 but got %d", status) + Expect(body).To(HaveHTTPBody(ContainSubstring(responseBodyMessage)), "expected response body to contain correct body message but got: %s", responseBodyMessage) - return err + return nil } func expectRequestToFail(appURL, address string) error {