From 9c702bfe63e6af6dcca92db26afe1cd97c1355d6 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Mon, 11 Nov 2024 12:16:27 +0000
Subject: [PATCH] fixing tests

---
 .../apis/ml/anomaly_detectors/create.ts       |  2 --
 .../apis/ml/filters/create_filters.ts         |  2 --
 .../apis/ml/modules/setup_module.ts           |  1 -
 .../apis/ml/system/has_privileges.ts          | 26 ++++++++++++-------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
index 44854dcaeece6..7aa328bc39d2e 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
@@ -92,7 +92,6 @@ export default ({ getService }: FtrProviderContext) => {
         responseBody: {
           statusCode: 403,
           error: 'Forbidden',
-          message: 'Forbidden',
         },
       },
     },
@@ -133,7 +132,6 @@ export default ({ getService }: FtrProviderContext) => {
           );
         } else {
           expect(body.error).to.eql(testData.expected.responseBody.error);
-          expect(body.message).to.eql(testData.expected.responseBody.message);
         }
       });
     }
diff --git a/x-pack/test/api_integration/apis/ml/filters/create_filters.ts b/x-pack/test/api_integration/apis/ml/filters/create_filters.ts
index 91d468593df82..e01f77da4405d 100644
--- a/x-pack/test/api_integration/apis/ml/filters/create_filters.ts
+++ b/x-pack/test/api_integration/apis/ml/filters/create_filters.ts
@@ -42,7 +42,6 @@ export default ({ getService }: FtrProviderContext) => {
         responseCode: 403,
         responseBody: {
           error: 'Forbidden',
-          message: 'Forbidden',
         },
       },
     },
@@ -58,7 +57,6 @@ export default ({ getService }: FtrProviderContext) => {
         responseCode: 403,
         responseBody: {
           error: 'Forbidden',
-          message: 'Forbidden',
         },
       },
     },
diff --git a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
index def9774a55ddc..a1a0937d2d321 100644
--- a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
@@ -669,7 +669,6 @@ export default ({ getService }: FtrProviderContext) => {
       expected: {
         responseCode: 403,
         error: 'Forbidden',
-        message: 'Forbidden',
       },
     },
   ];
diff --git a/x-pack/test/api_integration/apis/ml/system/has_privileges.ts b/x-pack/test/api_integration/apis/ml/system/has_privileges.ts
index 2e705240b403e..ac4872ec9c70f 100644
--- a/x-pack/test/api_integration/apis/ml/system/has_privileges.ts
+++ b/x-pack/test/api_integration/apis/ml/system/has_privileges.ts
@@ -7,7 +7,6 @@
 
 import expect from '@kbn/expect';
 
-import { MlHasPrivilegesResponse } from '@kbn/ml-plugin/public/application/services/ml_api_service';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { getCommonRequestHeader } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
@@ -17,11 +16,7 @@ export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertestWithoutAuth');
   const ml = getService('ml');
 
-  async function runRequest(
-    user: USER,
-    index: any,
-    expectedStatusCode = 200
-  ): Promise<MlHasPrivilegesResponse> {
+  async function runRequest(user: USER, index: any, expectedStatusCode = 200) {
     const { body, status } = await supertest
       .post(`/internal/ml/_has_privileges`)
       .auth(user, ml.securityCommon.getPasswordForUser(user))
@@ -104,7 +99,10 @@ export default ({ getService }: FtrProviderContext) => {
           privileges: ['write'],
         },
       ],
-      expectedResponse: { statusCode: 403, error: 'Forbidden', message: 'Forbidden' },
+      expectedResponse: {
+        statusCode: 403,
+        error: 'Forbidden',
+      },
       expectedStatusCode: 403,
     },
   ];
@@ -120,9 +118,17 @@ export default ({ getService }: FtrProviderContext) => {
     it('should return correct privileges for test data', async () => {
       for (const { user, index, expectedResponse, expectedStatusCode } of testData) {
         const response = await runRequest(user, index, expectedStatusCode);
-        expect(response).to.eql(
-          expectedResponse,
-          `expected ${JSON.stringify(expectedResponse)}, got ${JSON.stringify(response)}`
+        expect(response.statusCode).to.eql(
+          expectedResponse.statusCode,
+          `expected ${JSON.stringify(expectedResponse.statusCode)}, got ${JSON.stringify(
+            response.statusCode
+          )}`
+        );
+        expect(response.error).to.eql(
+          expectedResponse.error,
+          `expected ${JSON.stringify(expectedResponse.error)}, got ${JSON.stringify(
+            response.error
+          )}`
         );
       }
     });