Client instance service

src/lib/features/client-feature-toggles/tests/client-feature-toggle.e2e.test.ts

@@ -24,9 +24,6 @@ async function getSetup() {
         base,
         clientFeatureToggleStore: stores.clientFeatureToggleStore,
         request: supertest(app),
-        destroy: () => {
-            services.clientInstanceService.destroy();
-        },
     };
 }
 
@@ -43,26 +40,20 @@ const callGetAll = async (controller: FeatureController) => {
 
 let base;
 let request;
-let destroy;
 
 let flagResolver;
 
 beforeEach(async () => {
     const setup = await getSetup();
     base = setup.base;
     request = setup.request;
-    destroy = setup.destroy;
     flagResolver = {
         isEnabled: () => {
             return false;
         },
     };
 });
 
-afterEach(() => {
-    destroy();
-});
-
 test('should get empty getFeatures via client', () => {
     expect.assertions(1);
     return request

src/lib/routes/admin-api/config.test.ts

@@ -28,25 +28,16 @@ async function getSetup() {
     return {
         base,
         request: supertest(app),
-        destroy: () => {
-            services.clientInstanceService.destroy();
-        },
     };
 }
 
 let request;
 let base;
-let destroy;
 
 beforeEach(async () => {
     const setup = await getSetup();
     request = setup.request;
     base = setup.base;
-    destroy = setup.destroy;
-});
-
-afterEach(() => {
-    destroy();
 });
 
 test('should get ui config', async () => {

src/lib/routes/admin-api/context.test.ts

@@ -20,25 +20,16 @@ async function getSetup() {
     return {
         base,
         request: supertest(app),
-        destroy: () => {
-            services.clientInstanceService.destroy();
-        },
     };
 }
 
 let base;
 let request;
-let destroy;
 
 beforeEach(async () => {
     const setup = await getSetup();
     base = setup.base;
     request = setup.request;
-    destroy = setup.destroy;
-});
-
-afterEach(async () => {
-    await destroy();
 });
 
 test('should get all context definitions', () => {

src/lib/routes/admin-api/metrics.test.ts

@@ -19,25 +19,16 @@ async function getSetup() {
         stores,
         perms,
         config,
-        destroy: () => {
-            services.clientInstanceService.destroy();
-        },
     };
 }
 
 let stores;
 let request;
-let destroy;
 
 beforeEach(async () => {
     const setup = await getSetup();
     stores = setup.stores;
     request = setup.request;
-    destroy = setup.destroy;
-});
-
-afterEach(() => {
-    destroy();
 });
 
 test('/api/admin/metrics/seen-toggles is deprecated', () => {

src/lib/routes/admin-api/public-signup.test.ts

@@ -33,16 +33,11 @@ describe('Public Signup API', () => {
             request: supertest(app),
             stores,
             perms,
-            destroy: () => {
-                services.clientInstanceService.destroy();
-                services.publicSignupTokenService.destroy();
-            },
         };
     }
 
     let stores;
     let request;
-    let destroy;
 
     const user = {
         username: 'some-username',
@@ -55,12 +50,8 @@ describe('Public Signup API', () => {
         const setup = await getSetup();
         stores = setup.stores;
         request = setup.request;
-        destroy = setup.destroy;
     });
 
-    afterEach(() => {
-        destroy();
-    });
     const expireAt = (addDays: number = 7): Date => {
         const now = new Date();
         now.setDate(now.getDate() + addDays);

src/lib/routes/admin-api/strategy.test.ts

@@ -5,8 +5,6 @@ import permissions from '../../../test/fixtures/permissions';
 import getApp from '../../app';
 import { createServices } from '../../services';
 
-let destroy;
-
 async function getSetup() {
     const randomBase = `/random${Math.round(Math.random() * 1000)}`;
     const perms = permissions();
@@ -18,10 +16,6 @@ async function getSetup() {
     const services = createServices(stores, config);
     const app = await getApp(config, stores, services);
 
-    destroy = () => {
-        services.clientInstanceService.destroy();
-    };
-
     return {
         base: randomBase,
         strategyStore: stores.strategyStore,
@@ -30,10 +24,6 @@ async function getSetup() {
     };
 }
 
-afterEach(() => {
-    destroy();
-});
-
 test('add version numbers for /strategies', async () => {
     const { request, base } = await getSetup();
     return request

src/lib/routes/admin-api/tag.test.ts

@@ -21,26 +21,18 @@ async function getSetup() {
         perms,
         tagStore: stores.tagStore,
         request: supertest(app),
-        destroy: () => {
-            services.clientInstanceService.destroy();
-        },
     };
 }
 
 let base;
 let tagStore;
 let request;
-let destroy;
 
 beforeEach(async () => {
     const setup = await getSetup();
     base = setup.base;
     tagStore = setup.tagStore;
     request = setup.request;
-    destroy = setup.destroy;
-});
-afterEach(() => {
-    destroy();
 });
 
 test('should get empty getTags via admin', () => {

src/lib/routes/backstage.test.ts

@@ -19,5 +19,4 @@ test('should enable prometheus', async () => {
         .get('/internal-backstage/prometheus')
         .expect('Content-Type', /text/)
         .expect(200);
-    services.clientInstanceService.destroy();
 });

src/lib/routes/client-api/metrics.test.ts

@@ -19,10 +19,7 @@ async function getSetup(opts?: IUnleashOptions) {
         request: supertest(app),
         stores: db.stores,
         services,
-        destroy: async () => {
-            services.clientInstanceService.destroy();
-            await db.destroy();
-        },
+        destroy: db.destroy,
     };
 }
 
@@ -31,18 +28,22 @@ let stores: IUnleashStores;
 let services: IUnleashServices;
 let destroy;
 
-beforeEach(async () => {
+beforeAll(async () => {
     const setup = await getSetup();
     request = setup.request;
     stores = setup.stores;
     destroy = setup.destroy;
     services = setup.services;
 });
 
-afterEach(() => {
+afterAll(() => {
     destroy();
 });
 
+afterEach(async () => {
+    await stores.featureToggleStore.deleteAll();
+});
+
 test('should validate client metrics', () => {
     return request
         .post('/api/client/metrics')

src/lib/routes/client-api/register.test.ts

@@ -14,20 +14,14 @@ async function getSetup() {
     return {
         request: supertest(app),
         stores,
-        destroy: () => {
-            services.clientInstanceService.destroy();
-        },
     };
 }
 let request;
-let destroy;
 beforeEach(async () => {
     const setup = await getSetup();
     request = setup.request;
-    destroy = setup.destroy;
 });
 afterEach(() => {
-    destroy();
     getLogger.setMuteError(false);
 });
 

src/lib/routes/health-check.test.ts

@@ -15,21 +15,15 @@ async function getSetup() {
     return {
         request: supertest(app),
         stores,
-        destroy: () => {
-            services.clientInstanceService.destroy();
-        },
     };
 }
 let request;
-let destroy;
 beforeEach(async () => {
     const setup = await getSetup();
     request = setup.request;
-    destroy = setup.destroy;
 });
 
 afterEach(() => {
-    destroy();
     getLogger.setMuteError(false);
 });
 

src/lib/routes/public-invite.test.ts

@@ -39,16 +39,11 @@ describe('Public Signup API', () => {
             request: supertest(app),
             stores,
             perms,
-            destroy: () => {
-                services.clientInstanceService.destroy();
-                services.publicSignupTokenService.destroy();
-            },
         };
     }
 
     let stores;
     let request;
-    let destroy;
 
     const user = {
         username: 'some-username',
@@ -61,12 +56,8 @@ describe('Public Signup API', () => {
         const setup = await getSetup();
         stores = setup.stores;
         request = setup.request;
-        destroy = setup.destroy;
     });
 
-    afterEach(() => {
-        destroy();
-    });
     const expireAt = (addDays: number = 7): Date => {
         const now = new Date();
         now.setDate(now.getDate() + addDays);