[SIEM][CASE] Moves functional tests from "legacyEs" to "Es" (elastic#…

…65851)
cnasikas · May 8, 2020 · 158d5d1 · 158d5d1
1 parent f897841
commit 158d5d1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/x-pack/test/case_api_integration/basic/tests/configure/get_configure.ts b/x-pack/test/case_api_integration/basic/tests/configure/get_configure.ts
@@ -18,7 +18,7 @@ import {
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
 
   describe('get_configure', () => {
     afterEach(async () => {

diff --git a/x-pack/test/case_api_integration/basic/tests/configure/patch_configure.ts b/x-pack/test/case_api_integration/basic/tests/configure/patch_configure.ts
@@ -18,7 +18,7 @@ import {
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
 
   describe('post_configure', () => {
     afterEach(async () => {

diff --git a/x-pack/test/case_api_integration/basic/tests/configure/post_configure.ts b/x-pack/test/case_api_integration/basic/tests/configure/post_configure.ts
@@ -18,7 +18,7 @@ import {
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
-  const es = getService('legacyEs');
+  const es = getService('es');
 
   describe('post_configure', () => {
     afterEach(async () => {

diff --git a/x-pack/test/case_api_integration/common/lib/utils.ts b/x-pack/test/case_api_integration/common/lib/utils.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Client } from '@elastic/elasticsearch';
 import { CasesConfigureRequest, CasesConfigureResponse } from '../../../../plugins/case/common/api';
 
 export const getConfiguration = (connector_id: string = 'connector-1'): CasesConfigureRequest => {
@@ -29,12 +30,12 @@ export const removeServerGeneratedPropertiesFromConfigure = (
   return rest;
 };
 
-export const deleteConfiguration = async (es: any): Promise<void> => {
+export const deleteConfiguration = async (es: Client): Promise<void> => {
   await es.deleteByQuery({
     index: '.kibana',
     q: 'type:cases-configure',
-    waitForCompletion: true,
-    refresh: 'wait_for',
+    wait_for_completion: true,
+    refresh: true,
     body: {},
   });
 };