fix type issues and fix jest tests

dhurley14 · Jun 22, 2021 · b18d076 · b18d076
1 parent b8af9f9
commit b18d076
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/x-pack/plugins/rule_registry/server/routes/__mocks__/request_responses.ts b/x-pack/plugins/rule_registry/server/routes/__mocks__/request_responses.ts
@@ -22,6 +22,6 @@ export const getUpdateRequest = () =>
     body: {
       status: 'closed',
       ids: ['alert-1'],
-      indexName: '.alerts-observability-apm*',
+      index: '.alerts-observability-apm*',
     },
   });
diff --git a/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.test.ts b/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.test.ts
@@ -57,7 +57,7 @@ describe('updateAlertByIdRoute', () => {
             body: {
               status: 'closed',
               ids: 'alert-1',
-              indexName: '.alerts-observability-apm*',
+              index: '.alerts-observability-apm*',
             },
           }),
           context
@@ -76,7 +76,7 @@ describe('updateAlertByIdRoute', () => {
             body: {
               notStatus: 'closed',
               ids: ['alert-1'],
-              indexName: '.alerts-observability-apm*',
+              index: '.alerts-observability-apm*',
             },
           }),
           context

diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/get_alerts.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/get_alerts.ts
@@ -20,6 +20,7 @@ import {
   superUser,
   noKibanaPrivileges,
 } from '../../../common/lib/authentication/users';
+import type { User } from '../../../common/lib/authentication/types';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { getSpaceUrlPrefix } from '../../../common/lib/authentication/spaces';
 
@@ -34,13 +35,15 @@ export default ({ getService }: FtrProviderContext) => {
   const SPACE1 = 'space1';
   const SPACE2 = 'space2';
 
-  const getAPMIndexName = async (user) => {
-    const { body: indexNames } = await supertestWithoutAuth
+  const getAPMIndexName = async (user: User) => {
+    const {
+      body: indexNames,
+    }: { body: { index_name: string[] | undefined } } = await supertestWithoutAuth
       .get(`${getSpaceUrlPrefix(SPACE1)}${ALERTS_INDEX_URL}`)
       .auth(user.username, user.password)
       .set('kbn-xsrf', 'true')
       .expect(200);
-    const observabilityIndex = indexNames.index_name.find(
+    const observabilityIndex = indexNames?.index_name?.find(
       (indexName) => indexName === '.alerts-observability-apm'
     );
     expect(observabilityIndex).to.eql('.alerts-observability-apm');

diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/update_alert.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/update_alert.ts
@@ -14,6 +14,7 @@ import {
   superUser,
   noKibanaPrivileges,
 } from '../../../common/lib/authentication/users';
+import type { User } from '../../../common/lib/authentication/types';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { getSpaceUrlPrefix } from '../../../common/lib/authentication/spaces';
 
@@ -26,13 +27,15 @@ export default ({ getService }: FtrProviderContext) => {
   const ALERTS_INDEX_URL = `${TEST_URL}/index`;
   const SPACE1 = 'space1';
 
-  const getAPMIndexName = async (user) => {
-    const { body: indexNames } = await supertestWithoutAuth
+  const getAPMIndexName = async (user: User) => {
+    const {
+      body: indexNames,
+    }: { body: { index_name: string[] | undefined } } = await supertestWithoutAuth
       .get(`${getSpaceUrlPrefix(SPACE1)}${ALERTS_INDEX_URL}`)
       .auth(user.username, user.password)
       .set('kbn-xsrf', 'true')
       .expect(200);
-    const observabilityIndex = indexNames.index_name.find(
+    const observabilityIndex = indexNames?.index_name?.find(
       (indexName) => indexName === '.alerts-observability-apm'
     );
     expect(observabilityIndex).to.eql('.alerts-observability-apm');