test: fix ErrorContains (#9445)

Signed-off-by: Michael Crenshaw <michael@crenshaw.dev>

server/server_test.go

@@ -612,7 +612,8 @@ func TestAuthenticate_3rd_party_JWTs(t *testing.T) {
 				assert.Equal(t, testDataCopy.expectedClaims, claims)
 			}
 			if testDataCopy.expectedErrorContains != "" {
-				assert.Contains(t, err.Error(), 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)
 			}
@@ -655,7 +656,8 @@ func TestAuthenticate_no_request_metadata(t *testing.T) {
 			claims := ctx.Value("claims")
 			assert.Equal(t, testDataCopy.expectedClaims, claims)
 			if testDataCopy.expectedErrorContains != "" {
-				assert.Contains(t, err.Error(), 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)
 			}
@@ -702,7 +704,8 @@ func TestAuthenticate_no_SSO(t *testing.T) {
 			claims := ctx.Value("claims")
 			assert.Equal(t, testDataCopy.expectedClaims, claims)
 			if testDataCopy.expectedErrorMessage != "" {
-				assert.Contains(t, err.Error(), 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)
 			}
@@ -805,7 +808,8 @@ func TestAuthenticate_bad_request_metadata(t *testing.T) {
 			claims := ctx.Value("claims")
 			assert.Equal(t, testDataCopy.expectedClaims, claims)
 			if testDataCopy.expectedErrorMessage != "" {
-				assert.Contains(t, err.Error(), 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)
 			}