Skip to content

Commit 3feb18e

Browse files
toddbaerttoddbaert
authored
chore: use spec submodule (#568)
Signed-off-by: Todd Baert <[email protected]>
1 parent a88d8fc commit 3feb18e

File tree

11 files changed

+45
-46
lines changed

11 files changed

+45
-46
lines changed

‎.gitmodules‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
[submodule "libs/providers/flagd-web/schemas"]
55
path = libs/providers/flagd-web/schemas
66
url = https://github.com/open-feature/schemas
7-
[submodule "libs/providers/flagd/test-harness"]
8-
path = libs/providers/flagd/test-harness
9-
url = https://github.com/open-feature/test-harness
10-
[submodule "libs/providers/flagd-web/test-harness"]
11-
path = libs/providers/flagd-web/test-harness
12-
url = https://github.com/open-feature/test-harness
7+
[submodule "libs/providers/flagd/spec"]
8+
path = libs/providers/flagd/spec
9+
url = https://github.com/open-feature/spec.git
10+
[submodule "libs/providers/flagd-web/spec"]
11+
path = libs/providers/flagd-web/spec
12+
url = https://github.com/open-feature/spec.git

‎libs/providers/flagd-web/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
"executor": "nx:run-commands",
5959
"options": {
6060
"commands": [
61-
"git submodule update --init test-harness",
61+
"git submodule update --init spec",
6262
"rm -f -r ./src/e2e/features/*",
63-
"cp -v ./test-harness/features/evaluation.feature ./src/e2e/features/"
63+
"cp -v ./spec/specification/assets/gherkin/evaluation.feature ./src/e2e/features/"
6464
],
6565
"cwd": "libs/providers/flagd-web",
6666
"parallel": false

‎libs/providers/flagd-web/spec‎

Submodule spec added at a0b3777

‎libs/providers/flagd-web/src/e2e/features/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
evaluation.feature
1+
*.feature

‎libs/providers/flagd-web/src/e2e/step-definitions/evaluation.spec.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ const feature = loadFeature('features/evaluation.feature');
77
// get a client (flagd provider registered in setup)
88
const client = OpenFeature.getClient();
99

10-
const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
10+
const givenAnOpenfeatureClientIsRegistered = (
1111
given: (stepMatcher: string, stepDefinitionCallback: () => void) => void
1212
) => {
13-
given('a provider is registered with cache disabled', () => undefined);
13+
given('a provider is registered', () => undefined);
1414
};
1515

1616
defineFeature(feature, (test) => {
@@ -27,7 +27,7 @@ defineFeature(feature, (test) => {
2727
test('Resolves boolean value', ({ given, when, then }) => {
2828
let value: boolean;
2929

30-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
30+
givenAnOpenfeatureClientIsRegistered(given);
3131

3232
when(
3333
/^a boolean flag with key "(.*)" is evaluated with default value "(.*)"$/,
@@ -44,7 +44,7 @@ defineFeature(feature, (test) => {
4444
test('Resolves string value', ({ given, when, then }) => {
4545
let value: string;
4646

47-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
47+
givenAnOpenfeatureClientIsRegistered(given);
4848

4949
when(
5050
/^a string flag with key "(.*)" is evaluated with default value "(.*)"$/,
@@ -61,7 +61,7 @@ defineFeature(feature, (test) => {
6161
test('Resolves integer value', ({ given, when, then }) => {
6262
let value: number;
6363

64-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
64+
givenAnOpenfeatureClientIsRegistered(given);
6565

6666
when(
6767
/^an integer flag with key "(.*)" is evaluated with default value (\d+)$/,
@@ -79,7 +79,7 @@ defineFeature(feature, (test) => {
7979
test('Resolves float value', ({ given, when, then }) => {
8080
let value: number;
8181

82-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
82+
givenAnOpenfeatureClientIsRegistered(given);
8383

8484
when(
8585
/^a float flag with key "(.*)" is evaluated with default value (\d+\.?\d*)$/,
@@ -95,7 +95,7 @@ defineFeature(feature, (test) => {
9595

9696
test('Resolves object value', ({ given, when, then }) => {
9797
let value: JsonValue;
98-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
98+
givenAnOpenfeatureClientIsRegistered(given);
9999

100100
when(/^an object flag with key "(.*)" is evaluated with a null default value$/, (key: string) => {
101101
value = client.getObjectValue<JsonValue>(key, {});
@@ -114,7 +114,7 @@ defineFeature(feature, (test) => {
114114

115115
test('Resolves boolean details', ({ given, when, then }) => {
116116
let details: EvaluationDetails<boolean>;
117-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
117+
givenAnOpenfeatureClientIsRegistered(given);
118118

119119
when(
120120
/^a boolean flag with key "(.*)" is evaluated with details and default value "(.*)"$/,
@@ -136,7 +136,7 @@ defineFeature(feature, (test) => {
136136
test('Resolves string details', ({ given, when, then }) => {
137137
let details: EvaluationDetails<string>;
138138

139-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
139+
givenAnOpenfeatureClientIsRegistered(given);
140140

141141
when(
142142
/^a string flag with key "(.*)" is evaluated with details and default value "(.*)"$/,
@@ -158,7 +158,7 @@ defineFeature(feature, (test) => {
158158
test('Resolves integer details', ({ given, when, then }) => {
159159
let details: EvaluationDetails<number>;
160160

161-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
161+
givenAnOpenfeatureClientIsRegistered(given);
162162

163163
when(
164164
/^an integer flag with key "(.*)" is evaluated with details and default value (\d+)$/,
@@ -180,7 +180,7 @@ defineFeature(feature, (test) => {
180180
test('Resolves float details', ({ given, when, then }) => {
181181
let details: EvaluationDetails<number>;
182182

183-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
183+
givenAnOpenfeatureClientIsRegistered(given);
184184

185185
when(
186186
/^a float flag with key "(.*)" is evaluated with details and default value (\d+\.?\d*)$/,
@@ -202,7 +202,7 @@ defineFeature(feature, (test) => {
202202
test('Resolves object details', ({ given, when, then, and }) => {
203203
let details: EvaluationDetails<JsonValue>; // update this after merge
204204

205-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
205+
givenAnOpenfeatureClientIsRegistered(given);
206206

207207
when(/^an object flag with key "(.*)" is evaluated with details and a null default value$/, (key: string) => {
208208
details = client.getObjectDetails(key, {}); // update this after merge
@@ -233,7 +233,7 @@ defineFeature(feature, (test) => {
233233
let value: string;
234234
let flagKey: string;
235235

236-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
236+
givenAnOpenfeatureClientIsRegistered(given);
237237

238238
when(
239239
/^context contains keys "(.*)", "(.*)", "(.*)", "(.*)" with values "(.*)", "(.*)", (\d+), "(.*)"$/,
@@ -277,7 +277,7 @@ defineFeature(feature, (test) => {
277277
let fallbackValue: string;
278278
let details: ResolutionDetails<string>;
279279

280-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
280+
givenAnOpenfeatureClientIsRegistered(given);
281281

282282
when(
283283
/^a non-existent string flag with key "(.*)" is evaluated with details and a default value "(.*)"$/,
@@ -306,7 +306,7 @@ defineFeature(feature, (test) => {
306306
let fallbackValue: number;
307307
let details: ResolutionDetails<number>;
308308

309-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
309+
givenAnOpenfeatureClientIsRegistered(given);
310310

311311
when(
312312
/^a string flag with key "(.*)" is evaluated as an integer, with details and a default value (\d+)$/,

‎libs/providers/flagd-web/test-harness‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎libs/providers/flagd/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
"executor": "nx:run-commands",
5959
"options": {
6060
"commands": [
61-
"git submodule update --init test-harness",
61+
"git submodule update --init spec",
6262
"rm -f -r ./src/e2e/features/*",
63-
"cp -v ./test-harness/features/evaluation.feature ./src/e2e/features/"
63+
"cp -v ./spec/specification/assets/gherkin/evaluation.feature ./src/e2e/features/"
6464
],
6565
"cwd": "libs/providers/flagd",
6666
"parallel": false

‎libs/providers/flagd/spec‎

Submodule spec added at b575a8e

‎libs/providers/flagd/src/e2e/features/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
evaluation.feature
1+
*.feature

‎libs/providers/flagd/src/e2e/step-definitions/evaluation.spec.ts‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ const feature = loadFeature('features/evaluation.feature');
77
// get a client (flagd provider registered in setup)
88
const client = OpenFeature.getClient();
99

10-
const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
10+
const givenAnOpenfeatureClientIsRegistered = (
1111
given: (stepMatcher: string, stepDefinitionCallback: () => void) => void
1212
) => {
13-
// TODO: when the FlagdProvider is updated to support caching, we may need to disable it here for this test to work as expected.
14-
given('a provider is registered with cache disabled', () => undefined);
13+
given('a provider is registered', () => undefined);
1514
};
1615

1716
defineFeature(feature, (test) => {
@@ -29,7 +28,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
2928
let value: boolean;
3029
let flagKey: string;
3130

32-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
31+
givenAnOpenfeatureClientIsRegistered(given);
3332

3433
when(
3534
/^a boolean flag with key "(.*)" is evaluated with default value "(.*)"$/,
@@ -48,7 +47,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
4847
let value: string;
4948
let flagKey: string;
5049

51-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
50+
givenAnOpenfeatureClientIsRegistered(given);
5251

5352
when(
5453
/^a string flag with key "(.*)" is evaluated with default value "(.*)"$/,
@@ -67,7 +66,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
6766
let value: number;
6867
let flagKey: string;
6968

70-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
69+
givenAnOpenfeatureClientIsRegistered(given);
7170

7271
when(
7372
/^an integer flag with key "(.*)" is evaluated with default value (\d+)$/,
@@ -86,7 +85,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
8685
let value: number;
8786
let flagKey: string;
8887

89-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
88+
givenAnOpenfeatureClientIsRegistered(given);
9089

9190
when(
9291
/^a float flag with key "(.*)" is evaluated with default value (\d+\.?\d*)$/,
@@ -105,7 +104,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
105104
let value: JsonValue;
106105
let flagKey: string;
107106

108-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
107+
givenAnOpenfeatureClientIsRegistered(given);
109108

110109
when(/^an object flag with key "(.*)" is evaluated with a null default value$/, async (key: string) => {
111110
flagKey = key;
@@ -127,7 +126,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
127126
let details: EvaluationDetails<boolean>;
128127
let flagKey: string;
129128

130-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
129+
givenAnOpenfeatureClientIsRegistered(given);
131130

132131
when(
133132
/^a boolean flag with key "(.*)" is evaluated with details and default value "(.*)"$/,
@@ -151,7 +150,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
151150
let details: EvaluationDetails<string>;
152151
let flagKey: string;
153152

154-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
153+
givenAnOpenfeatureClientIsRegistered(given);
155154

156155
when(
157156
/^a string flag with key "(.*)" is evaluated with details and default value "(.*)"$/,
@@ -175,7 +174,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
175174
let details: EvaluationDetails<number>;
176175
let flagKey: string;
177176

178-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
177+
givenAnOpenfeatureClientIsRegistered(given);
179178

180179
when(
181180
/^an integer flag with key "(.*)" is evaluated with details and default value (\d+)$/,
@@ -199,7 +198,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
199198
let details: EvaluationDetails<number>;
200199
let flagKey: string;
201200

202-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
201+
givenAnOpenfeatureClientIsRegistered(given);
203202

204203
when(
205204
/^a float flag with key "(.*)" is evaluated with details and default value (\d+\.?\d*)$/,
@@ -223,7 +222,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
223222
let details: EvaluationDetails<JsonValue>; // update this after merge
224223
let flagKey: string;
225224

226-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
225+
givenAnOpenfeatureClientIsRegistered(given);
227226

228227
when(/^an object flag with key "(.*)" is evaluated with details and a null default value$/, async (key: string) => {
229228
flagKey = key;
@@ -255,7 +254,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
255254
let value: string;
256255
let flagKey: string;
257256

258-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
257+
givenAnOpenfeatureClientIsRegistered(given);
259258

260259
when(
261260
/^context contains keys "(.*)", "(.*)", "(.*)", "(.*)" with values "(.*)", "(.*)", (\d+), "(.*)"$/,
@@ -299,7 +298,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
299298
let fallbackValue: string;
300299
let details: ResolutionDetails<string>;
301300

302-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
301+
givenAnOpenfeatureClientIsRegistered(given);
303302

304303
when(
305304
/^a non-existent string flag with key "(.*)" is evaluated with details and a default value "(.*)"$/,
@@ -328,7 +327,7 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
328327
let fallbackValue: number;
329328
let details: ResolutionDetails<number>;
330329

331-
givenAnOpenfeatureClientIsRegisteredWithCacheDisabled(given);
330+
givenAnOpenfeatureClientIsRegistered(given);
332331

333332
when(
334333
/^a string flag with key "(.*)" is evaluated as an integer, with details and a default value (\d+)$/,
@@ -351,4 +350,4 @@ const givenAnOpenfeatureClientIsRegisteredWithCacheDisabled = (
351350
}
352351
);
353352
});
354-
});
353+
});

0 commit comments

Comments
 (0)