fixup: pr changes

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

Diff for: libs/providers/flagd-web/src/e2e/step-definitions/flag.ts

@@ -255,31 +255,29 @@ export const flagStepDefinitions: StepDefinitions = ({ given, and, when, then })
     },
   );
 
-  let ran: Promise<boolean>;
+  let ran: boolean;
   when('a PROVIDER_READY handler is added', () => {
-    ran = new Promise<boolean>((resolve) => {
-      client.addHandler(ProviderEvents.Ready, async () => {
-        resolve(true);
-      });
+    client.addHandler(ProviderEvents.Ready, async () => {
+      ran = true;
     });
   });
   then('the PROVIDER_READY handler must run', () => {
     expect(ran).toBeTruthy();
   });
 
   when('a PROVIDER_CONFIGURATION_CHANGED handler is added', () => {
-    ran = new Promise<boolean>((resolve) => {
-      client.addHandler(ProviderEvents.ConfigurationChanged, async (details) => {
-        // file writes are not atomic, so we get a few events in quick succession from the testbed
-        // some will not contain changes, this tolerates that; at least 1 should have our change
-
-        // All Flags are changed we do not provide a list of changed flags, that is the nature of the web sdk
-        //if (details?.flagsChanged?.length) {
-        //  flagsChanged = details?.flagsChanged;
-
-        resolve(true);
-        //}
-      });
+    client.addHandler(ProviderEvents.ConfigurationChanged, async (details) => {
+      // file writes are not atomic, so we get a few events in quick succession from the testbed
+      // some will not contain changes, this tolerates that; at least 1 should have our change
+
+      // TODO: enable this for testing of issue
+      //if (details?.flagsChanged?.length) {
+      //  flagsChanged = details?.flagsChanged;
+      //  ran = true;
+      //}
+
+      // TODO: remove this for testing of issue
+      ran = true;
     });
   });
 
@@ -289,11 +287,11 @@ export const flagStepDefinitions: StepDefinitions = ({ given, and, when, then })
   });
 
   then('the PROVIDER_CONFIGURATION_CHANGED handler must run', async () => {
-    expect(await ran).toBeTruthy();
+    expect(ran).toBeTruthy();
   });
 
   and(/^the event details must indicate "(.*)" was altered$/, (flagName) => {
-    // All Flags are changed we do not provide a list of changed flags, that is the nature of the web sdk
+    // TODO: enable this for testing of issue
     //expect(flagsChanged).toContain(flagName);
   });
 

Diff for: libs/providers/flagd/src/e2e/step-definitions/flag.ts

@@ -284,29 +284,25 @@ export const flagStepDefinitions: StepDefinitions = ({ given, and, when, then })
     },
   );
 
-  let ran: Promise<boolean>;
+  let ran: boolean;
   when('a PROVIDER_READY handler is added', () => {
-    ran = new Promise<boolean>((resolve) => {
-      client.addHandler(ProviderEvents.Ready, async () => {
-        resolve(true);
-      });
+    client.addHandler(ProviderEvents.Ready, async () => {
+      ran = true;
     });
   });
   then('the PROVIDER_READY handler must run', () => {
     expect(ran).toBeTruthy();
   });
 
   when('a PROVIDER_CONFIGURATION_CHANGED handler is added', () => {
-    ran = new Promise<boolean>((resolve) => {
-      client.addHandler(ProviderEvents.ConfigurationChanged, async (details) => {
-        // file writes are not atomic, so we get a few events in quick succession from the testbed
-        // some will not contain changes, this tolerates that; at least 1 should have our change
-        if (details?.flagsChanged?.length) {
-          flagsChanged = details?.flagsChanged;
-
-          resolve(true);
-        }
-      });
+    client.addHandler(ProviderEvents.ConfigurationChanged, async (details) => {
+      // file writes are not atomic, so we get a few events in quick succession from the testbed
+      // some will not contain changes, this tolerates that; at least 1 should have our change
+      if (details?.flagsChanged?.length) {
+        flagsChanged = details?.flagsChanged;
+
+        ran = true;
+      }
     });
   });
 

Diff for: libs/shared/flagd-core/src/e2e/index.ts

@@ -3,6 +3,5 @@ export const E2E_CLIENT_NAME = 'e2e';
 export const IMAGE_VERSION = 'v0.5.13';
 
 export function getGherkinTestPath(file: string, modulePath = 'test-harness/gherkin/'): string {
-  // TODO: find a way to resolve this in a generic manner - currently this works, because of the file structure
   return `<rootdir>/../../../../../shared/flagd-core/${modulePath}${file}`;
 }