Skip to content

Commit 2ff16c9

Browse files
raju-optiraju-opti
committed
fix tests
1 parent 5439eb2 commit 2ff16c9

File tree

2 files changed

+62
-39
lines changed

2 files changed

+62
-39
lines changed

‎lib/index.browser.tests.js

Lines changed: 61 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -833,9 +833,7 @@ describe('javascript-sdk (Browser)', function() {
833833
});
834834
projectConfigManager.pushUpdate(config);
835835

836-
const readyData = await client.onReady();
837-
assert.equal(readyData.success, true);
838-
assert.isUndefined(readyData.reason);
836+
await client.onReady();
839837

840838
sinon.assert.called(fakeEventManager.start);
841839
});
@@ -869,9 +867,7 @@ describe('javascript-sdk (Browser)', function() {
869867
});
870868

871869
projectConfigManager.pushUpdate(config);
872-
const readyData = await client.onReady();
873-
assert.equal(readyData.success, true);
874-
assert.isUndefined(readyData.reason);
870+
await client.onReady();
875871

876872
client.sendOdpEvent(ODP_EVENT_ACTION.INITIALIZED);
877873

@@ -916,10 +912,7 @@ describe('javascript-sdk (Browser)', function() {
916912
},
917913
});
918914
projectConfigManager.pushUpdate(config);
919-
const readyData = await client.onReady();
920-
921-
assert.equal(readyData.success, true);
922-
assert.isUndefined(readyData.reason);
915+
await client.onReady();
923916

924917
client.sendOdpEvent('test', '', new Map([['eamil', '[email protected]']]), new Map([['key', 'value']]));
925918
clock.tick(10000);
@@ -961,9 +954,7 @@ describe('javascript-sdk (Browser)', function() {
961954
});
962955

963956
projectConfigManager.pushUpdate(config);
964-
const readyData = await client.onReady();
965-
assert.equal(readyData.success, true);
966-
assert.isUndefined(readyData.reason);
957+
await client.onReady();
967958

968959
// fs-user-id
969960
client.sendOdpEvent(ODP_EVENT_ACTION.INITIALIZED, undefined, new Map([['fs-user-id', 'fsUserA']]));
@@ -1021,8 +1012,15 @@ describe('javascript-sdk (Browser)', function() {
10211012
flush: sinon.spy(),
10221013
};
10231014

1015+
const config = createProjectConfig(testData.getOdpIntegratedConfigWithoutSegments());
1016+
const projectConfigManager = getMockProjectConfigManager({
1017+
initConfig: config,
1018+
onRunning: Promise.resolve(),
1019+
});
1020+
1021+
10241022
const client = optimizelyFactory.createInstance({
1025-
datafile: testData.getOdpIntegratedConfigWithSegments(),
1023+
projectConfigManager,
10261024
errorHandler: fakeErrorHandler,
10271025
eventDispatcher: fakeEventDispatcher,
10281026
eventBatchSize: null,
@@ -1032,9 +1030,8 @@ describe('javascript-sdk (Browser)', function() {
10321030
},
10331031
});
10341032

1035-
const readyData = await client.onReady();
1036-
assert.equal(readyData.success, true);
1037-
assert.isUndefined(readyData.reason);
1033+
projectConfigManager.pushUpdate(config);
1034+
await client.onReady();
10381035

10391036
client.sendOdpEvent('');
10401037
sinon.assert.called(logger.error);
@@ -1059,8 +1056,14 @@ describe('javascript-sdk (Browser)', function() {
10591056
flush: sinon.spy(),
10601057
};
10611058

1059+
const config = createProjectConfig(testData.getOdpIntegratedConfigWithoutSegments());
1060+
const projectConfigManager = getMockProjectConfigManager({
1061+
initConfig: config,
1062+
onRunning: Promise.resolve(),
1063+
});
1064+
10621065
const client = optimizelyFactory.createInstance({
1063-
datafile: testData.getOdpIntegratedConfigWithSegments(),
1066+
projectConfigManager,
10641067
errorHandler: fakeErrorHandler,
10651068
eventDispatcher: fakeEventDispatcher,
10661069
eventBatchSize: null,
@@ -1069,10 +1072,8 @@ describe('javascript-sdk (Browser)', function() {
10691072
eventManager: fakeEventManager,
10701073
},
10711074
});
1072-
1073-
const readyData = await client.onReady();
1074-
assert.equal(readyData.success, true);
1075-
assert.isUndefined(readyData.reason);
1075+
projectConfigManager.pushUpdate(config);
1076+
await client.onReady();
10761077

10771078
client.sendOdpEvent('dummy-action', '');
10781079

@@ -1083,8 +1084,14 @@ describe('javascript-sdk (Browser)', function() {
10831084
});
10841085

10851086
it('should log an error when attempting to send an odp event when odp is disabled', async () => {
1087+
const config = createProjectConfig(testData.getTestProjectConfigWithFeatures());
1088+
const projectConfigManager = getMockProjectConfigManager({
1089+
initConfig: config,
1090+
onRunning: Promise.resolve(),
1091+
});
1092+
10861093
const client = optimizelyFactory.createInstance({
1087-
datafile: testData.getTestProjectConfigWithFeatures(),
1094+
projectConfigManager,
10881095
errorHandler: fakeErrorHandler,
10891096
eventDispatcher: fakeEventDispatcher,
10901097
eventBatchSize: null,
@@ -1094,9 +1101,10 @@ describe('javascript-sdk (Browser)', function() {
10941101
},
10951102
});
10961103

1097-
const readyData = await client.onReady();
1098-
assert.equal(readyData.success, true);
1099-
assert.isUndefined(readyData.reason);
1104+
projectConfigManager.pushUpdate(config);
1105+
1106+
await client.onReady();
1107+
11001108
assert.isUndefined(client.odpManager);
11011109
sinon.assert.calledWith(logger.log, optimizelyFactory.enums.LOG_LEVEL.INFO, 'ODP Disabled.');
11021110

@@ -1109,8 +1117,14 @@ describe('javascript-sdk (Browser)', function() {
11091117
});
11101118

11111119
it('should log a warning when attempting to use an event batch size other than 1', async () => {
1120+
const config = createProjectConfig(testData.getTestProjectConfigWithFeatures());
1121+
const projectConfigManager = getMockProjectConfigManager({
1122+
initConfig: config,
1123+
onRunning: Promise.resolve(),
1124+
});
1125+
11121126
const client = optimizelyFactory.createInstance({
1113-
datafile: testData.getOdpIntegratedConfigWithSegments(),
1127+
projectConfigManager,
11141128
errorHandler: fakeErrorHandler,
11151129
eventDispatcher: fakeEventDispatcher,
11161130
eventBatchSize: null,
@@ -1120,9 +1134,9 @@ describe('javascript-sdk (Browser)', function() {
11201134
},
11211135
});
11221136

1123-
const readyData = await client.onReady();
1124-
assert.equal(readyData.success, true);
1125-
assert.isUndefined(readyData.reason);
1137+
projectConfigManager.pushUpdate(config);
1138+
1139+
await client.onReady();
11261140

11271141
client.sendOdpEvent(ODP_EVENT_ACTION.INITIALIZED);
11281142

@@ -1147,9 +1161,14 @@ describe('javascript-sdk (Browser)', function() {
11471161
});
11481162

11491163
let datafile = testData.getOdpIntegratedConfigWithSegments();
1164+
const config = createProjectConfig(datafile);
1165+
const projectConfigManager = getMockProjectConfigManager({
1166+
initConfig: config,
1167+
onRunning: Promise.resolve(),
1168+
});
11501169

11511170
const client = optimizelyFactory.createInstance({
1152-
datafile,
1171+
projectConfigManager,
11531172
errorHandler: fakeErrorHandler,
11541173
eventDispatcher: fakeEventDispatcher,
11551174
eventBatchSize: null,
@@ -1160,9 +1179,8 @@ describe('javascript-sdk (Browser)', function() {
11601179
},
11611180
});
11621181

1163-
const readyData = await client.onReady();
1164-
assert.equal(readyData.success, true);
1165-
assert.isUndefined(readyData.reason);
1182+
projectConfigManager.pushUpdate(config);
1183+
await client.onReady();
11661184

11671185
client.sendOdpEvent(ODP_EVENT_ACTION.INITIALIZED);
11681186

@@ -1201,8 +1219,14 @@ describe('javascript-sdk (Browser)', function() {
12011219
logger,
12021220
});
12031221
const datafile = testData.getOdpIntegratedConfigWithSegments();
1222+
const config = createProjectConfig(datafile);
1223+
const projectConfigManager = getMockProjectConfigManager({
1224+
initConfig: config,
1225+
onRunning: Promise.resolve(),
1226+
});
1227+
12041228
const client = optimizelyFactory.createInstance({
1205-
datafile,
1229+
projectConfigManager,
12061230
errorHandler: fakeErrorHandler,
12071231
eventDispatcher: fakeEventDispatcher,
12081232
eventBatchSize: null,
@@ -1213,9 +1237,8 @@ describe('javascript-sdk (Browser)', function() {
12131237
},
12141238
});
12151239

1216-
const readyData = await client.onReady();
1217-
assert.equal(readyData.success, true);
1218-
assert.isUndefined(readyData.reason);
1240+
projectConfigManager.pushUpdate(config);
1241+
await client.onReady();
12191242

12201243
clock.tick(100);
12211244

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"clean:win": "(if exist dist rd /s/q dist)",
7575
"lint": "tsc --noEmit && eslint 'lib/**/*.js' 'lib/**/*.ts'",
7676
"test-vitest": "tsc --noEmit --p tsconfig.spec.json && vitest run",
77-
"test-mocha": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha -r ts-node/register -r lib/tests/exit_on_unhandled_rejection.js 'lib/index.lite.tests.js'",
77+
"test-mocha": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha -r ts-node/register -r lib/tests/exit_on_unhandled_rejection.js 'lib/index.browser.tests.js'",
7878
"test": "npm run test-mocha && npm run test-vitest",
7979
"posttest": "npm run lint",
8080
"test-ci": "npm run test-xbrowser && npm run test-umdbrowser",

0 commit comments

Comments
 (0)