From cf1f44e3799f5f1dbbc63c53a019073d3d2176a4 Mon Sep 17 00:00:00 2001 From: Michael Crenshaw Date: Wed, 18 May 2022 08:21:10 -0500 Subject: [PATCH] test: fix ErrorContains (#9445) Signed-off-by: Michael Crenshaw --- server/server_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/server_test.go b/server/server_test.go index 5773a3bb0eb2..2d7fb9dfd835 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -614,7 +614,8 @@ func TestAuthenticate_3rd_party_JWTs(t *testing.T) { assert.Equal(t, testDataCopy.expectedClaims, claims) } if testDataCopy.expectedErrorContains != "" { - assert.ErrorContains(t, err, testDataCopy.expectedErrorContains, "Authenticate should have thrown an error and blocked the request") + assert.Error(t, err, "Authenticate should have thrown an error and blocked the request") + assert.Contains(t, err.Error(), testDataCopy.expectedErrorContains) } else { assert.NoError(t, err) } @@ -657,7 +658,8 @@ func TestAuthenticate_no_request_metadata(t *testing.T) { claims := ctx.Value("claims") assert.Equal(t, testDataCopy.expectedClaims, claims) if testDataCopy.expectedErrorContains != "" { - assert.ErrorContains(t, err, testDataCopy.expectedErrorContains, "Authenticate should have thrown an error and blocked the request") + assert.Error(t, err, "Authenticate should have thrown an error and blocked the request") + assert.Contains(t, err.Error(), testDataCopy.expectedErrorContains) } else { assert.NoError(t, err) } @@ -704,7 +706,8 @@ func TestAuthenticate_no_SSO(t *testing.T) { claims := ctx.Value("claims") assert.Equal(t, testDataCopy.expectedClaims, claims) if testDataCopy.expectedErrorMessage != "" { - assert.ErrorContains(t, err, testDataCopy.expectedErrorMessage, "Authenticate should have thrown an error and blocked the request") + assert.Error(t, err, "Authenticate should have thrown an error and blocked the request") + assert.Contains(t, err.Error(), testDataCopy.expectedErrorMessage) } else { assert.NoError(t, err) } @@ -807,7 +810,8 @@ func TestAuthenticate_bad_request_metadata(t *testing.T) { claims := ctx.Value("claims") assert.Equal(t, testDataCopy.expectedClaims, claims) if testDataCopy.expectedErrorMessage != "" { - assert.ErrorContains(t, err, testDataCopy.expectedErrorMessage, "Authenticate should have thrown an error and blocked the request") + assert.Error(t, err, "Authenticate should have thrown an error and blocked the request") + assert.Contains(t, err.Error(), testDataCopy.expectedErrorMessage) } else { assert.NoError(t, err) }