Removing inter-test dependency

elastic · Aug 10, 2020 · a108028 · a108028
1 parent 0086f08
commit a108028
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/install_overrides.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/install_overrides.ts
@@ -5,18 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import * as st from 'supertest';
-import supertestAsPromised from 'supertest-as-promised';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { warnAndSkipTest } from '../../helpers';
 
-export const deletePackage = async (
-  supertest: st.SuperTest<supertestAsPromised.Test>,
-  pkgkey: string
-) => {
-  await supertest.delete(`/api/ingest_manager/epm/packages/${pkgkey}`).set('kbn-xsrf', 'xxxx');
-};
-
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const es = getService('es');
@@ -26,11 +17,15 @@ export default function ({ getService }: FtrProviderContext) {
   const mappingsPackage = 'overrides-0.1.0';
   const server = dockerServers.get('registry');
 
+  const deletePackage = async (pkgkey: string) => {
+    await supertest.delete(`/api/ingest_manager/epm/packages/${pkgkey}`).set('kbn-xsrf', 'xxxx');
+  };
+
   describe('installs packages that include settings and mappings overrides', async () => {
     after(async () => {
       if (server.enabled) {
         // remove the package just in case it being installed will affect other tests
-        await deletePackage(supertest, mappingsPackage);
+        await deletePackage(mappingsPackage);
       }
     });
 

diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/install_prerelease.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/install_prerelease.ts
@@ -6,28 +6,31 @@
 
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { warnAndSkipTest } from '../../helpers';
-import { deletePackage } from './install_overrides';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const dockerServers = getService('dockerServers');
   const log = getService('log');
 
-  const pkgkey = 'prerelease-0.1.0-dev.0+abc';
+  const testPackage = 'prerelease-0.1.0-dev.0+abc';
   const server = dockerServers.get('registry');
 
+  const deletePackage = async (pkgkey: string) => {
+    await supertest.delete(`/api/ingest_manager/epm/packages/${pkgkey}`).set('kbn-xsrf', 'xxxx');
+  };
+
   describe('installs package that has a prerelease version', async () => {
     after(async () => {
       if (server.enabled) {
         // remove the package just in case it being installed will affect other tests
-        await deletePackage(supertest, pkgkey);
+        await deletePackage(testPackage);
       }
     });
 
     it('should install the package correctly', async function () {
       if (server.enabled) {
         await supertest
-          .post(`/api/ingest_manager/epm/packages/${pkgkey}`)
+          .post(`/api/ingest_manager/epm/packages/${testPackage}`)
           .set('kbn-xsrf', 'xxxx')
           .expect(200);
       } else {