Skip to content

Commit 504bb8c

Browse files
junaed-optimizelyjunaed-optimizely
committed
[FSSDK-11529] fsc fix
1 parent eb3df08 commit 504bb8c

5 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎lib/core/decision_service/index.spec.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ const getHoldoutTestDatafile = () => {
137137
id: 'holdout_running_id',
138138
key: 'holdout_running',
139139
status: 'Running',
140-
includeFlags: [],
141-
excludeFlags: [],
140+
includedFlags: [],
141+
excludedFlags: [],
142142
audienceIds: ['4001'], // age_22 audience
143143
audienceConditions: ['or', '4001'],
144144
variations: [
@@ -159,8 +159,8 @@ const getHoldoutTestDatafile = () => {
159159
id: "holdout_not_bucketed_id",
160160
key: "holdout_not_bucketed",
161161
status: "Running",
162-
includeFlags: [],
163-
excludeFlags: [],
162+
includedFlags: [],
163+
excludedFlags: [],
164164
audienceIds: ['4002'],
165165
audienceConditions: ['or', '4002'],
166166
variations: [
@@ -1940,8 +1940,8 @@ describe('DecisionService', () => {
19401940
id: 'holdout_included_id',
19411941
key: 'holdout_included',
19421942
status: 'Running',
1943-
includeFlags: ['flag_1'],
1944-
excludeFlags: [],
1943+
includedFlags: ['flag_1'],
1944+
excludedFlags: [],
19451945
audienceIds: ['4002'], // age_40 audience
19461946
audienceConditions: ['or', '4002'],
19471947
variations: [
@@ -1989,8 +1989,8 @@ describe('DecisionService', () => {
19891989
id: 'holdout_included_specific_id',
19901990
key: 'holdout_included_specific',
19911991
status: 'Running',
1992-
includeFlags: ['flag_1'],
1993-
excludeFlags: [],
1992+
includedFlags: ['flag_1'],
1993+
excludedFlags: [],
19941994
audienceIds: ['4002'], // age_60 audience (age <= 60)
19951995
audienceConditions: ['or', '4002'],
19961996
variations: [
@@ -2176,7 +2176,7 @@ describe('DecisionService', () => {
21762176
if(holdout.id === 'holdout_running_id') {
21772177
return {
21782178
...holdout,
2179-
excludeFlags: ['flag_1']
2179+
excludedFlags: ['flag_1']
21802180
}
21812181
}
21822182
return holdout;
@@ -2212,8 +2212,8 @@ describe('DecisionService', () => {
22122212
id: 'holdout_second_id',
22132213
key: 'holdout_second',
22142214
status: 'Running',
2215-
includeFlags: [],
2216-
excludeFlags: [],
2215+
includedFlags: [],
2216+
excludedFlags: [],
22172217
audienceIds: [], // no audience requirements
22182218
audienceConditions: [],
22192219
variations: [

‎lib/optimizely/index.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ const holdoutData = [
3838
id: 'holdout_test_id',
3939
key: 'holdout_test_key',
4040
status: 'Running',
41-
includeFlags: [],
42-
excludeFlags: [],
41+
includedFlags: [],
42+
excludedFlags: [],
4343
audienceIds: [],
4444
audienceConditions: [],
4545
variations: [
@@ -427,7 +427,7 @@ describe('Optimizely', () => {
427427
it('should handle holdout with included flags', async () => {
428428
// Modify holdout to include specific flag
429429
const modifiedHoldout = { ...projectConfig.holdouts[0] };
430-
modifiedHoldout.includeFlags = ['1001']; // flag_1 ID from test datafile
430+
modifiedHoldout.includedFlags = ['1001']; // flag_1 ID from test datafile
431431
projectConfig.holdouts = [modifiedHoldout];
432432

433433
vi.spyOn(decisionService, 'resolveVariationsForFeatureList').mockImplementation(() => {
@@ -470,7 +470,7 @@ describe('Optimizely', () => {
470470
it('should handle holdout with excluded flags', async () => {
471471
// Modify holdout to exclude specific flag
472472
const modifiedHoldout = { ...projectConfig.holdouts[0] };
473-
modifiedHoldout.excludeFlags = ['1001']; // flag_1 ID from test datafile
473+
modifiedHoldout.excludedFlags = ['1001']; // flag_1 ID from test datafile
474474
projectConfig.holdouts = [modifiedHoldout];
475475

476476
// Mock normal feature test behavior for excluded flag
@@ -514,14 +514,14 @@ describe('Optimizely', () => {
514514
it('should handle multiple holdouts with correct priority', async () => {
515515
// Setup multiple holdouts
516516
const holdout1 = { ...projectConfig.holdouts[0] };
517-
holdout1.excludeFlags = ['1001']; // exclude flag_1
517+
holdout1.excludedFlags = ['1001']; // exclude flag_1
518518

519519
const holdout2 = {
520520
id: 'holdout_test_id_2',
521521
key: 'holdout_test_key_2',
522522
status: 'Running',
523-
includeFlags: ['1001'], // include flag_1
524-
excludeFlags: [],
523+
includedFlags: ['1001'], // include flag_1
524+
excludedFlags: [],
525525
audienceIds: [],
526526
audienceConditions: [],
527527
variations: [
@@ -542,7 +542,7 @@ describe('Optimizely', () => {
542542

543543
projectConfig.holdouts = [holdout1, holdout2];
544544

545-
// Mock that holdout2 takes priority due to includeFlags
545+
// Mock that holdout2 takes priority due to includedFlags
546546
vi.spyOn(decisionService, 'resolveVariationsForFeatureList').mockImplementation(() => {
547547
return Value.of('async', [{
548548
error: false,

‎lib/project_config/project_config.spec.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ const getHoldoutDatafile = () => {
316316
id: 'holdout_id_1',
317317
key: 'holdout_1',
318318
status: 'Running',
319-
includeFlags: [],
320-
excludeFlags: [],
319+
includedFlags: [],
320+
excludedFlags: [],
321321
audienceIds: ['13389130056'],
322322
audienceConditions: ['or', '13389130056'],
323323
variations: [
@@ -338,8 +338,8 @@ const getHoldoutDatafile = () => {
338338
id: 'holdout_id_2',
339339
key: 'holdout_2',
340340
status: 'Running',
341-
includeFlags: [],
342-
excludeFlags: ['feature_3'],
341+
includedFlags: [],
342+
excludedFlags: ['feature_3'],
343343
audienceIds: [],
344344
audienceConditions: [],
345345
variations: [
@@ -360,8 +360,8 @@ const getHoldoutDatafile = () => {
360360
id: 'holdout_id_3',
361361
key: 'holdout_3',
362362
status: 'Draft',
363-
includeFlags: ['feature_1'],
364-
excludeFlags: [],
363+
includedFlags: ['feature_1'],
364+
excludedFlags: [],
365365
audienceIds: [],
366366
audienceConditions: [],
367367
variations: [
@@ -415,8 +415,8 @@ describe('createProjectConfig - holdouts, feature toggle is on', () => {
415415

416416
expect(configObj.globalHoldouts).toHaveLength(2);
417417
expect(configObj.globalHoldouts).toEqual([
418-
configObj.holdouts[0], // holdout_1 has empty includeFlags
419-
configObj.holdouts[1] // holdout_2 has empty includeFlags
418+
configObj.holdouts[0], // holdout_1 has empty includedFlags
419+
configObj.holdouts[1] // holdout_2 has empty includedFlags
420420
]);
421421

422422
expect(configObj.includedHoldouts).toEqual({
@@ -443,16 +443,16 @@ describe('createProjectConfig - holdouts, feature toggle is on', () => {
443443
expect(configObj.flagHoldoutsMap).toEqual({});
444444
});
445445

446-
it('should handle undefined includeFlags and excludeFlags in holdout', function() {
446+
it('should handle undefined includedFlags and excludedFlags in holdout', function() {
447447
const datafile = getHoldoutDatafile();
448-
datafile.holdouts[0].includeFlags = undefined;
449-
datafile.holdouts[0].excludeFlags = undefined;
448+
datafile.holdouts[0].includedFlags = undefined;
449+
datafile.holdouts[0].excludedFlags = undefined;
450450

451451
const configObj = projectConfig.createProjectConfig(JSON.parse(JSON.stringify(datafile)));
452452

453453
expect(configObj.holdouts).toHaveLength(3);
454-
expect(configObj.holdouts[0].includeFlags).toEqual([]);
455-
expect(configObj.holdouts[0].excludeFlags).toEqual([]);
454+
expect(configObj.holdouts[0].includedFlags).toEqual([]);
455+
expect(configObj.holdouts[0].excludedFlags).toEqual([]);
456456
});
457457
});
458458

‎lib/project_config/project_config.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -361,12 +361,12 @@ const parseHoldoutsConfig = (projectConfig: ProjectConfig): void => {
361361
projectConfig.flagHoldoutsMap = {};
362362

363363
projectConfig.holdouts.forEach((holdout) => {
364-
if (!holdout.includeFlags) {
365-
holdout.includeFlags = [];
364+
if (!holdout.includedFlags) {
365+
holdout.includedFlags = [];
366366
}
367367

368-
if (!holdout.excludeFlags) {
369-
holdout.excludeFlags = [];
368+
if (!holdout.excludedFlags) {
369+
holdout.excludedFlags = [];
370370
}
371371

372372
holdout.variationKeyMap = keyBy(holdout.variations, 'key');
@@ -376,17 +376,17 @@ const parseHoldoutsConfig = (projectConfig: ProjectConfig): void => {
376376
...keyBy(holdout.variations, 'id'),
377377
};
378378

379-
if (holdout.includeFlags.length === 0) {
379+
if (holdout.includedFlags.length === 0) {
380380
projectConfig.globalHoldouts.push(holdout);
381381

382-
holdout.excludeFlags.forEach((flagKey) => {
382+
holdout.excludedFlags.forEach((flagKey: string) => {
383383
if (!projectConfig.excludedHoldouts[flagKey]) {
384384
projectConfig.excludedHoldouts[flagKey] = [];
385385
}
386386
projectConfig.excludedHoldouts[flagKey].push(holdout);
387387
});
388388
} else {
389-
holdout.includeFlags.forEach((flagKey) => {
389+
holdout.includedFlags.forEach((flagKey: string) => {
390390
if (!projectConfig.includedHoldouts[flagKey]) {
391391
projectConfig.includedHoldouts[flagKey] = [];
392392
}

‎lib/shared_types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ export type HoldoutStatus = 'Draft' | 'Running' | 'Concluded' | 'Archived';
177177

178178
export interface Holdout extends ExperimentCore {
179179
status: HoldoutStatus;
180-
includeFlags: string[];
181-
excludeFlags: string[];
180+
includedFlags: string[];
181+
excludedFlags: string[];
182182
}
183183

184184
export enum VariableType {

0 commit comments

Comments
 (0)