chore: various gherkin improvements for e2e tests (#1008)

Signed-off-by: Simon Schrottner <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Todd Baert <[email protected]>
open-feature · Nov 6, 2024 · 40abd8e · 40abd8e
1 parent 9a4395b
commit 40abd8e
Show file tree

Hide file tree

Showing 46 changed files with 1,111 additions and 1,042 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,14 +5,14 @@
 	path = libs/providers/flagd-web/schemas
 	url = https://github.com/open-feature/schemas
 [submodule "libs/providers/flagd/spec"]
-	path = libs/providers/flagd/spec
-	url = https://github.com/open-feature/spec.git
-[submodule "libs/providers/flagd-web/spec"]
-	path = libs/providers/flagd-web/spec
-	url = https://github.com/open-feature/spec.git
+  path = libs/providers/flagd/spec
+  url = https://github.com/open-feature/spec.git
 [submodule "libs/shared/flagd-core/flagd-schemas"]
 	path = libs/shared/flagd-core/flagd-schemas
 	url = https://github.com/open-feature/flagd-schemas.git
-[submodule "libs/providers/flagd/flagd-testbed"]
-	path = libs/providers/flagd/flagd-testbed
-	url = https://github.com/open-feature/flagd-testbed.git
+[submodule "libs/shared/flagd-core/test-harness"]
+	path = libs/shared/flagd-core/test-harness
+	url = https://github.com/open-feature/flagd-testbed
+[submodule "libs/shared/flagd-core/spec"]
+	path = libs/shared/flagd-core/spec
+	url = https://github.com/open-feature/spec
diff --git a/libs/providers/flagd-web/project.json b/libs/providers/flagd-web/project.json
@@ -58,18 +58,6 @@
         }
       ]
     },
-    "pullTestHarness": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "git submodule update --init spec",
-          "rm -f -r ./src/e2e/features/*",
-          "cp -v ./spec/specification/assets/gherkin/evaluation.feature ./src/e2e/features/"
-        ],
-        "cwd": "libs/providers/flagd-web",
-        "parallel": false
-      }
-    },
     "e2e": {
       "executor": "nx:run-commands",
       "options": {
@@ -84,7 +72,7 @@
           "target": "generate"
         },
         {
-          "target": "pullTestHarness"
+          "target": "flagd-core:pullTestHarness"
         }
       ]
     },

diff --git a/libs/providers/flagd-web/schemas b/libs/providers/flagd-web/schemas
diff --git a/libs/providers/flagd-web/spec b/libs/providers/flagd-web/spec
diff --git a/libs/providers/flagd-web/src/e2e/constants.ts b/libs/providers/flagd-web/src/e2e/constants.ts
@@ -1,3 +1,5 @@
+import { getGherkinTestPath } from '@openfeature/flagd-core';
+
 export const FLAGD_NAME = 'flagd-web';
 
-export const IMAGE_VERSION = 'v0.5.6';
+export const GHERKIN_EVALUATION_FEATURE = getGherkinTestPath('flagd.feature');
diff --git a/libs/providers/flagd-web/src/e2e/features/.gitignore b/libs/providers/flagd-web/src/e2e/features/.gitignore
diff --git a/libs/providers/flagd-web/src/e2e/features/.gitkeep b/libs/providers/flagd-web/src/e2e/features/.gitkeep
diff --git a/libs/providers/flagd-web/src/e2e/index.ts b/libs/providers/flagd-web/src/e2e/index.ts
@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './step-definitions';
diff --git a/libs/providers/flagd-web/src/e2e/jest.config.ts b/libs/providers/flagd-web/src/e2e/jest.config.ts
@@ -4,6 +4,7 @@ export default {
     '^.+\\.[tj]s$': ['ts-jest', { tsconfig: './tsconfig.lib.json' }],
   },
   moduleNameMapper: {
+    '@openfeature/flagd-core': ['<rootDir>/../../../../shared/flagd-core/src'],
     '^(.*)\\.js$': ['$1.js', '$1.ts', '$1'],
   },
   testEnvironment: 'node',