Skip to content

Commit 5439eb2

Browse files
raju-optiraju-opti
committed
fix more test
1 parent f1a68e4 commit 5439eb2

File tree

3 files changed

+28
-22
lines changed

3 files changed

+28
-22
lines changed

‎lib/index.lite.tests.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import Optimizely from './optimizely';
2121
import * as loggerPlugin from './plugins/logger';
2222
import optimizelyFactory from './index.lite';
2323
import configValidator from './utils/config_validator';
24+
import { getMockProjectConfigManager } from './tests/mock_project_config_manager';
25+
import { createProjectConfig } from './core/project_config';
2426

2527
describe('optimizelyFactory', function() {
2628
describe('APIs', function() {
@@ -56,24 +58,20 @@ describe('optimizelyFactory', function() {
5658
var localLogger = loggerPlugin.createLogger({ logLevel: enums.LOG_LEVEL.INFO });
5759
assert.doesNotThrow(function() {
5860
var optlyInstance = optimizelyFactory.createInstance({
59-
datafile: {},
61+
projectConfigManager: getMockProjectConfigManager(),
6062
logger: localLogger,
6163
});
62-
// Invalid datafile causes onReady Promise rejection - catch this
63-
optlyInstance.onReady().catch(function() {});
6464
});
6565
sinon.assert.calledWith(localLogger.log, enums.LOG_LEVEL.ERROR);
6666
});
6767

6868
it('should create an instance of optimizely', function() {
6969
var optlyInstance = optimizelyFactory.createInstance({
70-
datafile: {},
70+
projectConfigManager: getMockProjectConfigManager(),
7171
errorHandler: fakeErrorHandler,
7272
eventDispatcher: fakeEventDispatcher,
7373
logger: fakeLogger,
7474
});
75-
// Invalid datafile causes onReady Promise rejection - catch this
76-
optlyInstance.onReady().catch(function() {});
7775

7876
assert.instanceOf(optlyInstance, Optimizely);
7977
assert.equal(optlyInstance.clientVersion, '5.3.4');

‎lib/index.node.tests.js

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import testData from './tests/test_data';
2323
import * as loggerPlugin from './plugins/logger';
2424
import optimizelyFactory from './index.node';
2525
import configValidator from './utils/config_validator';
26+
import { getMockProjectConfigManager } from './tests/mock_project_config_manager';
27+
import { createProjectConfig } from './core/project_config';
2628

2729
describe('optimizelyFactory', function() {
2830
describe('APIs', function() {
@@ -58,11 +60,9 @@ describe('optimizelyFactory', function() {
5860
var localLogger = loggerPlugin.createLogger({ logLevel: enums.LOG_LEVEL.INFO });
5961
assert.doesNotThrow(function() {
6062
var optlyInstance = optimizelyFactory.createInstance({
61-
datafile: {},
63+
projectConfigManager: getMockProjectConfigManager(),
6264
logger: localLogger,
6365
});
64-
// Invalid datafile causes onReady Promise rejection - catch this
65-
optlyInstance.onReady().catch(function() {});
6666
});
6767
sinon.assert.calledWith(localLogger.log, enums.LOG_LEVEL.ERROR);
6868
});
@@ -71,23 +71,19 @@ describe('optimizelyFactory', function() {
7171
configValidator.validate.throws(new Error('Invalid config or something'));
7272
assert.doesNotThrow(function() {
7373
var optlyInstance = optimizelyFactory.createInstance({
74-
datafile: {},
74+
projectConfigManager: getMockProjectConfigManager(),
7575
});
76-
// Invalid datafile causes onReady Promise rejection - catch this
77-
optlyInstance.onReady().catch(function() {});
7876
});
7977
sinon.assert.calledOnce(console.error);
8078
});
8179

8280
it('should create an instance of optimizely', function() {
8381
var optlyInstance = optimizelyFactory.createInstance({
84-
datafile: {},
82+
projectConfigManager: getMockProjectConfigManager(),
8583
errorHandler: fakeErrorHandler,
8684
eventDispatcher: fakeEventDispatcher,
8785
logger: fakeLogger,
8886
});
89-
// Invalid datafile causes onReady Promise rejection - catch this
90-
optlyInstance.onReady().catch(function() {});
9187

9288
assert.instanceOf(optlyInstance, Optimizely);
9389
assert.equal(optlyInstance.clientVersion, '5.3.4');
@@ -105,7 +101,9 @@ describe('optimizelyFactory', function() {
105101

106102
it('should ignore invalid event flush interval and use default instead', function() {
107103
optimizelyFactory.createInstance({
108-
datafile: testData.getTestProjectConfigWithFeatures(),
104+
projectConfigManager: getMockProjectConfigManager({
105+
initConfig: createProjectConfig(testData.getTestProjectConfigWithFeatures()),
106+
}),
109107
errorHandler: fakeErrorHandler,
110108
eventDispatcher: fakeEventDispatcher,
111109
logger: fakeLogger,
@@ -121,7 +119,9 @@ describe('optimizelyFactory', function() {
121119

122120
it('should use default event flush interval when none is provided', function() {
123121
optimizelyFactory.createInstance({
124-
datafile: testData.getTestProjectConfigWithFeatures(),
122+
projectConfigManager: getMockProjectConfigManager({
123+
initConfig: createProjectConfig(testData.getTestProjectConfigWithFeatures()),
124+
}),
125125
errorHandler: fakeErrorHandler,
126126
eventDispatcher: fakeEventDispatcher,
127127
logger: fakeLogger,
@@ -136,7 +136,9 @@ describe('optimizelyFactory', function() {
136136

137137
it('should use provided event flush interval when valid', function() {
138138
optimizelyFactory.createInstance({
139-
datafile: testData.getTestProjectConfigWithFeatures(),
139+
projectConfigManager: getMockProjectConfigManager({
140+
initConfig: createProjectConfig(testData.getTestProjectConfigWithFeatures()),
141+
}),
140142
errorHandler: fakeErrorHandler,
141143
eventDispatcher: fakeEventDispatcher,
142144
logger: fakeLogger,
@@ -152,7 +154,9 @@ describe('optimizelyFactory', function() {
152154

153155
it('should ignore invalid event batch size and use default instead', function() {
154156
optimizelyFactory.createInstance({
155-
datafile: testData.getTestProjectConfigWithFeatures(),
157+
projectConfigManager: getMockProjectConfigManager({
158+
initConfig: createProjectConfig(testData.getTestProjectConfigWithFeatures()),
159+
}),
156160
errorHandler: fakeErrorHandler,
157161
eventDispatcher: fakeEventDispatcher,
158162
logger: fakeLogger,
@@ -168,7 +172,9 @@ describe('optimizelyFactory', function() {
168172

169173
it('should use default event batch size when none is provided', function() {
170174
optimizelyFactory.createInstance({
171-
datafile: testData.getTestProjectConfigWithFeatures(),
175+
projectConfigManager: getMockProjectConfigManager({
176+
initConfig: createProjectConfig(testData.getTestProjectConfigWithFeatures()),
177+
}),
172178
errorHandler: fakeErrorHandler,
173179
eventDispatcher: fakeEventDispatcher,
174180
logger: fakeLogger,
@@ -183,7 +189,9 @@ describe('optimizelyFactory', function() {
183189

184190
it('should use provided event batch size when valid', function() {
185191
optimizelyFactory.createInstance({
186-
datafile: testData.getTestProjectConfigWithFeatures(),
192+
projectConfigManager: getMockProjectConfigManager({
193+
initConfig: createProjectConfig(testData.getTestProjectConfigWithFeatures()),
194+
}),
187195
errorHandler: fakeErrorHandler,
188196
eventDispatcher: fakeEventDispatcher,
189197
logger: fakeLogger,

‎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.node.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.lite.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)