Skip to content

test: fix ErrorContains #9445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crenshaw-dev merged 1 commit into from
May 18, 2022
Merged

test: fix ErrorContains #9445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down