From 808e02564b67a89b9098c098eb57af841afd7152 Mon Sep 17 00:00:00 2001
From: Christos Nasikas <christos.nasikas@elastic.co>
Date: Fri, 8 May 2020 21:24:44 +0300
Subject: [PATCH] [SIEM][CASE] Moves functional tests from "legacyEs" to "Es"
 (#65851)

---
 .../basic/tests/configure/get_configure.ts                 | 2 +-
 .../basic/tests/configure/patch_configure.ts               | 2 +-
 .../basic/tests/configure/post_configure.ts                | 2 +-
 x-pack/test/case_api_integration/common/lib/utils.ts       | 7 ++++---
 4 files changed, 7 insertions(+), 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
index a9fc2706a6ba20..930cf42b9efc5c 100644
--- 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
index d66baa2a2eee2b..5f7d7c4c5c346b 100644
--- 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
index c2284492e5b771..86214a2bd3187f 100644
--- 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
index 6d0db69309b908..df768ff09b3689 100644
--- 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: {},
   });
 };