From e257be361b07875db8895a3e4fef5233e3d2a9a9 Mon Sep 17 00:00:00 2001
From: Christopher Kolstad <chriswk@getunleash.ai>
Date: Thu, 16 Sep 2021 11:09:49 +0200
Subject: [PATCH] fix duplicate test key for dbInit

---
 src/lib/routes/admin-api/feature.ts           |  2 ++
 src/test/e2e/api/admin/feature.e2e.test.ts    |  3 +++
 .../client/feature.token.access.e2e.test.ts   |  1 +
 .../feature-toggle-service-v2.e2e.test.ts     | 26 ++++++++++++++-----
 .../stores/user-feedback-store.e2e.test.ts    |  2 +-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/lib/routes/admin-api/feature.ts b/src/lib/routes/admin-api/feature.ts
index bc123acb4c..337832c082 100644
--- a/src/lib/routes/admin-api/feature.ts
+++ b/src/lib/routes/admin-api/feature.ts
@@ -174,6 +174,7 @@ class FeatureController extends Controller {
                     s,
                     createdFeature.project,
                     createdFeature.name,
+                    userName,
                 ),
             ),
         );
@@ -219,6 +220,7 @@ class FeatureController extends Controller {
                         s,
                         projectId,
                         featureName,
+                        userName,
                     ),
                 ),
             );
diff --git a/src/test/e2e/api/admin/feature.e2e.test.ts b/src/test/e2e/api/admin/feature.e2e.test.ts
index 6604cd585b..f9c72bc350 100644
--- a/src/test/e2e/api/admin/feature.e2e.test.ts
+++ b/src/test/e2e/api/admin/feature.e2e.test.ts
@@ -32,6 +32,7 @@ beforeAll(async () => {
             strategy,
             projectId,
             toggle.name,
+            username,
         );
     };
 
@@ -273,6 +274,7 @@ test('can not toggle of feature that does not exist', async () => {
 test('can toggle a feature that does exist', async () => {
     expect.assertions(0);
     const featureName = 'existing.feature';
+    const username = 'toggle-feature';
     const feature =
         await app.services.featureToggleServiceV2.createFeatureToggle(
             'default',
@@ -285,6 +287,7 @@ test('can toggle a feature that does exist', async () => {
         defaultStrategy,
         'default',
         featureName,
+        username,
     );
     return app.request
         .post(`/api/admin/features/${feature.name}/toggle`)
diff --git a/src/test/e2e/api/client/feature.token.access.e2e.test.ts b/src/test/e2e/api/client/feature.token.access.e2e.test.ts
index 119ec44a0d..2611201c57 100644
--- a/src/test/e2e/api/client/feature.token.access.e2e.test.ts
+++ b/src/test/e2e/api/client/feature.token.access.e2e.test.ts
@@ -57,6 +57,7 @@ beforeAll(async () => {
         },
         project,
         feature1,
+        username,
     );
     await featureToggleServiceV2.createStrategy(
         {
diff --git a/src/test/e2e/services/feature-toggle-service-v2.e2e.test.ts b/src/test/e2e/services/feature-toggle-service-v2.e2e.test.ts
index 834bd76d23..43b764417d 100644
--- a/src/test/e2e/services/feature-toggle-service-v2.e2e.test.ts
+++ b/src/test/e2e/services/feature-toggle-service-v2.e2e.test.ts
@@ -27,6 +27,8 @@ afterAll(async () => {
 });
 
 test('Should create feature toggle strategy configuration', async () => {
+    const projectId = 'default';
+    const username = 'feature-toggle';
     const config: Omit<IStrategyConfig, 'id'> = {
         name: 'default',
         constraints: [],
@@ -43,8 +45,9 @@ test('Should create feature toggle strategy configuration', async () => {
 
     const createdConfig = await service.createStrategy(
         config,
-        'default',
+        projectId,
         'Demo',
+        username,
     );
 
     expect(createdConfig.name).toEqual('default');
@@ -52,6 +55,8 @@ test('Should create feature toggle strategy configuration', async () => {
 });
 
 test('Should be able to update existing strategy configuration', async () => {
+    const projectId = 'default';
+    const username = 'existing-strategy';
     const config: Omit<IStrategyConfig, 'id'> = {
         name: 'default',
         constraints: [],
@@ -59,7 +64,7 @@ test('Should be able to update existing strategy configuration', async () => {
     };
 
     await service.createFeatureToggle(
-        'default',
+        projectId,
         {
             name: 'update-existing-strategy',
         },
@@ -70,11 +75,18 @@ test('Should be able to update existing strategy configuration', async () => {
         config,
         'default',
         'update-existing-strategy',
+        username,
     );
     expect(createdConfig.name).toEqual('default');
-    const updatedConfig = await service.updateStrategy(createdConfig.id, {
-        parameters: { b2b: true },
-    });
+    const updatedConfig = await service.updateStrategy(
+        createdConfig.id,
+        GLOBAL_ENV,
+        projectId,
+        username,
+        {
+            parameters: { b2b: true },
+        },
+    );
     expect(createdConfig.id).toEqual(updatedConfig.id);
     expect(updatedConfig.parameters).toEqual({ b2b: true });
 });
@@ -96,7 +108,7 @@ test('Should include legacy props in event log when updating strategy configurat
         userName,
     );
 
-    await service.createStrategy(config, 'default', featureName);
+    await service.createStrategy(config, 'default', featureName, userName);
     await service.updateEnabled(
         'default',
         featureName,
@@ -112,6 +124,7 @@ test('Should include legacy props in event log when updating strategy configurat
 });
 
 test('Should be able to get strategy by id', async () => {
+    const userName = 'strategy';
     const config: Omit<IStrategyConfig, 'id'> = {
         name: 'default',
         constraints: [],
@@ -130,6 +143,7 @@ test('Should be able to get strategy by id', async () => {
         config,
         'default',
         'Demo',
+        userName,
     );
     const fetchedConfig = await service.getStrategy(createdConfig.id);
     expect(fetchedConfig).toEqual(createdConfig);
diff --git a/src/test/e2e/stores/user-feedback-store.e2e.test.ts b/src/test/e2e/stores/user-feedback-store.e2e.test.ts
index 7e6fd5bae3..78836c55f8 100644
--- a/src/test/e2e/stores/user-feedback-store.e2e.test.ts
+++ b/src/test/e2e/stores/user-feedback-store.e2e.test.ts
@@ -10,7 +10,7 @@ let userStore: IUserStore;
 let currentUser;
 
 beforeAll(async () => {
-    db = await dbInit('project_store_serial', getLogger);
+    db = await dbInit('user_feedback_store', getLogger);
     stores = db.stores;
     userFeedbackStore = stores.userFeedbackStore;
     userStore = stores.userStore;