diff --git a/lib/core/decision_service/index.tests.js b/lib/core/decision_service/index.tests.js index 89b7113eb..431b95efa 100644 --- a/lib/core/decision_service/index.tests.js +++ b/lib/core/decision_service/index.tests.js @@ -30,7 +30,6 @@ import Optimizely from '../../optimizely'; import OptimizelyUserContext from '../../optimizely_user_context'; import projectConfig, { createProjectConfig } from '../../project_config/project_config'; import AudienceEvaluator from '../audience_evaluator'; -import errorHandler from '../../plugins/error_handler'; import eventDispatcher from '../../event_processor/event_dispatcher/default_dispatcher.browser'; import * as jsonSchemaValidator from '../../utils/json_schema_validator'; import { getMockProjectConfigManager } from '../../tests/mock/mock_project_config_manager'; @@ -1053,17 +1052,14 @@ describe('lib/core/decision_service', function() { isValidInstance: true, logger: createdLogger, eventProcessor: getForwardingEventProcessor(eventDispatcher), - notificationCenter: createNotificationCenter(createdLogger, errorHandler), - errorHandler: errorHandler, + notificationCenter: createNotificationCenter(createdLogger), }); sinon.stub(eventDispatcher, 'dispatchEvent'); - sinon.stub(errorHandler, 'handleError'); }); afterEach(function() { eventDispatcher.dispatchEvent.restore(); - errorHandler.handleError.restore(); }); var testUserAttributes = { diff --git a/lib/index.browser.ts b/lib/index.browser.ts index 48c996cbd..848524f48 100644 --- a/lib/index.browser.ts +++ b/lib/index.browser.ts @@ -15,7 +15,6 @@ */ import configValidator from './utils/config_validator'; -import defaultErrorHandler from './plugins/error_handler'; import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.browser'; import sendBeaconEventDispatcher from './event_processor/event_dispatcher/send_beacon_dispatcher.browser'; import * as enums from './utils/enums'; @@ -97,7 +96,6 @@ const __internalResetRetryState = function(): void { }; export { - defaultErrorHandler as errorHandler, defaultEventDispatcher as eventDispatcher, sendBeaconEventDispatcher, enums, @@ -119,7 +117,6 @@ export * from './common_exports'; export default { ...commonExports, - errorHandler: defaultErrorHandler, eventDispatcher: defaultEventDispatcher, sendBeaconEventDispatcher, enums, diff --git a/lib/index.node.ts b/lib/index.node.ts index f66abcf28..c0d7b41db 100644 --- a/lib/index.node.ts +++ b/lib/index.node.ts @@ -18,7 +18,6 @@ import Optimizely from './optimizely'; import * as enums from './utils/enums'; import configValidator from './utils/config_validator'; -import defaultErrorHandler from './plugins/error_handler'; import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.node'; import { createNotificationCenter } from './notification_center'; import { OptimizelyDecideOption, Client, Config } from './shared_types'; @@ -73,7 +72,6 @@ const createInstance = function(config: Config): Client | null { * Entry point into the Optimizely Node testing SDK */ export { - defaultErrorHandler as errorHandler, defaultEventDispatcher as eventDispatcher, enums, createInstance, @@ -91,7 +89,6 @@ export * from './common_exports'; export default { ...commonExports, - errorHandler: defaultErrorHandler, eventDispatcher: defaultEventDispatcher, enums, createInstance, diff --git a/lib/index.react_native.spec.ts b/lib/index.react_native.spec.ts index 8132b9e76..42ba24821 100644 --- a/lib/index.react_native.spec.ts +++ b/lib/index.react_native.spec.ts @@ -40,7 +40,6 @@ describe('javascript-sdk/react-native', () => { describe('APIs', () => { it('should expose logger, errorHandler, eventDispatcher and enums', () => { - expect(optimizelyFactory.errorHandler).toBeDefined(); expect(optimizelyFactory.eventDispatcher).toBeDefined(); expect(optimizelyFactory.enums).toBeDefined(); }); diff --git a/lib/index.react_native.ts b/lib/index.react_native.ts index bfbea0aca..243d1fea3 100644 --- a/lib/index.react_native.ts +++ b/lib/index.react_native.ts @@ -17,7 +17,6 @@ import * as enums from './utils/enums'; import Optimizely from './optimizely'; import configValidator from './utils/config_validator'; -import defaultErrorHandler from './plugins/error_handler'; import defaultEventDispatcher from './event_processor/event_dispatcher/default_dispatcher.browser'; import { createNotificationCenter } from './notification_center'; import { OptimizelyDecideOption, Client, Config } from './shared_types'; @@ -80,7 +79,6 @@ const createInstance = function(config: Config): Client | null { * Entry point into the Optimizely Javascript SDK for React Native */ export { - defaultErrorHandler as errorHandler, defaultEventDispatcher as eventDispatcher, enums, createInstance, @@ -98,7 +96,6 @@ export * from './common_exports'; export default { ...commonExports, - errorHandler: defaultErrorHandler, eventDispatcher: defaultEventDispatcher, enums, createInstance, diff --git a/lib/notification_center/index.tests.js b/lib/notification_center/index.tests.js index a7bf83cee..11e6da2bb 100644 --- a/lib/notification_center/index.tests.js +++ b/lib/notification_center/index.tests.js @@ -18,9 +18,7 @@ import { assert } from 'chai'; import { createNotificationCenter } from './'; import * as enums from '../utils/enums'; -import errorHandler from '../plugins/error_handler'; import { NOTIFICATION_TYPES } from './type'; -import { create } from 'lodash'; var LOG_LEVEL = enums.LOG_LEVEL; @@ -35,20 +33,17 @@ var createLogger = () => ({ describe('lib/core/notification_center', function() { describe('APIs', function() { var mockLogger = createLogger({ logLevel: LOG_LEVEL.INFO }); - var mockErrorHandler = errorHandler.handleError; var mockLoggerStub; - var mockErrorHandlerStub; + var notificationCenterInstance; var sandbox; beforeEach(function() { sandbox = sinon.sandbox.create(); mockLoggerStub = sandbox.stub(mockLogger, 'log'); - mockErrorHandlerStub = sandbox.stub(mockErrorHandler, 'handleError'); notificationCenterInstance = createNotificationCenter({ logger: mockLoggerStub, - errorHandler: mockErrorHandlerStub, }); }); diff --git a/lib/optimizely/index.tests.js b/lib/optimizely/index.tests.js index 3f5e536ba..f2a739a04 100644 --- a/lib/optimizely/index.tests.js +++ b/lib/optimizely/index.tests.js @@ -22,9 +22,7 @@ import OptimizelyUserContext from '../optimizely_user_context'; import { OptimizelyDecideOption } from '../shared_types'; import AudienceEvaluator from '../core/audience_evaluator'; import * as bucketer from '../core/bucketer'; -import * as projectConfigManager from '../project_config/project_config_manager'; import * as enums from '../utils/enums'; -import errorHandler from '../plugins/error_handler'; import fns from '../utils/fns'; import * as decisionService from '../core/decision_service'; import * as jsonSchemaValidator from '../utils/json_schema_validator'; @@ -155,17 +153,15 @@ describe('lib/optimizely', function() { }); describe('constructor', function() { - var stubErrorHandler = { handleError: function() {} }; var stubEventDispatcher = { dispatchEvent: function() { return Promise.resolve(null); }, }; var createdLogger = createLogger({ logLevel: LOG_LEVEL.INFO }); - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: stubErrorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger }); var eventProcessor = getForwardingEventProcessor(stubEventDispatcher); beforeEach(function() { - sinon.stub(stubErrorHandler, 'handleError'); sinon.stub(createdLogger, 'debug'); sinon.stub(createdLogger, 'info'); sinon.stub(createdLogger, 'warn'); @@ -173,7 +169,6 @@ describe('lib/optimizely', function() { }); afterEach(function() { - stubErrorHandler.handleError.restore(); createdLogger.debug.restore(); createdLogger.info.restore(); createdLogger.warn.restore(); @@ -184,7 +179,6 @@ describe('lib/optimizely', function() { it('should log if the client engine passed in is invalid', function() { new Optimizely({ projectConfigManager: getMockProjectConfigManager(), - errorHandler: stubErrorHandler, eventDispatcher: stubEventDispatcher, logger: createdLogger, notificationCenter, @@ -200,7 +194,7 @@ describe('lib/optimizely', function() { new Optimizely({ projectConfigManager: getMockProjectConfigManager(), clientEngine: 'node-sdk', - errorHandler: stubErrorHandler, + eventDispatcher: stubEventDispatcher, logger: createdLogger, defaultDecideOptions: 'invalid_options', @@ -216,7 +210,6 @@ describe('lib/optimizely', function() { var instance = new Optimizely({ projectConfigManager: getMockProjectConfigManager(), clientEngine: 'react-sdk', - errorHandler: stubErrorHandler, eventDispatcher: stubEventDispatcher, logger: createdLogger, notificationCenter, @@ -300,7 +293,7 @@ describe('lib/optimizely', function() { var bucketStub; var fakeDecisionResponse; var eventDispatcher = getMockEventDispatcher(); - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger }); var eventProcessor = getForwardingEventProcessor(eventDispatcher, notificationCenter); var createdLogger = createLogger({ logLevel: LOG_LEVEL.INFO, @@ -314,7 +307,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, isValidInstance: true, @@ -324,7 +317,7 @@ describe('lib/optimizely', function() { }); bucketStub = sinon.stub(bucketer, 'bucket'); - sinon.stub(errorHandler, 'handleError'); + sinon.stub(createdLogger, 'debug'); sinon.stub(createdLogger, 'info'); sinon.stub(createdLogger, 'warn'); @@ -335,7 +328,7 @@ describe('lib/optimizely', function() { afterEach(function() { eventDispatcher.dispatchEvent.reset(); bucketer.bucket.restore(); - errorHandler.handleError.restore(); + createdLogger.debug.restore(); createdLogger.info.restore(); createdLogger.warn.restore(); @@ -927,7 +920,6 @@ describe('lib/optimizely', function() { var instance = new Optimizely({ projectConfigManager: mockConfigManager, - errorHandler: errorHandler, eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, logger: createLogger({ @@ -1652,7 +1644,7 @@ describe('lib/optimizely', function() { 'testUser' ); - sinon.assert.notCalled(errorHandler.handleError); + // sinon.assert.notCalled(errorHandler.handleError); }); it('should throw an error for invalid attributes', function() { @@ -1671,7 +1663,7 @@ describe('lib/optimizely', function() { it('should not throw an error for an event key without associated experiment IDs', function() { optlyInstance.track('testEventWithoutExperiments', 'testUser'); - sinon.assert.notCalled(errorHandler.handleError); + // sinon.assert.notCalled(errorHandler.handleError); }); it('should track when logger is in DEBUG mode', function() { @@ -1681,7 +1673,6 @@ describe('lib/optimizely', function() { var instance = new Optimizely({ projectConfigManager: mockConfigManager, - errorHandler: errorHandler, eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, logger: createLogger({ @@ -2539,7 +2530,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -2602,7 +2593,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventProcessor, eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, @@ -2659,7 +2650,7 @@ describe('lib/optimizely', function() { var optly = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -2700,7 +2691,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, isValidInstance: true, @@ -4308,7 +4299,7 @@ describe('lib/optimizely', function() { logLevel: LOG_LEVEL.INFO, logToConsole: false, }); - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger, }); var eventDispatcher = getMockEventDispatcher(); var eventProcessor = getForwardingEventProcessor( eventDispatcher, @@ -4323,7 +4314,6 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -4334,7 +4324,7 @@ describe('lib/optimizely', function() { }); bucketStub = sinon.stub(bucketer, 'bucket'); - sinon.stub(errorHandler, 'handleError'); + sinon.stub(createdLogger, 'debug'); sinon.stub(createdLogger, 'info'); sinon.stub(createdLogger, 'warn'); @@ -4345,7 +4335,7 @@ describe('lib/optimizely', function() { afterEach(function() { eventDispatcher.dispatchEvent.reset(); bucketer.bucket.restore(); - errorHandler.handleError.restore(); + createdLogger.debug.restore(); createdLogger.info.restore(); createdLogger.warn.restore(); @@ -4445,7 +4435,7 @@ describe('lib/optimizely', function() { })); - sinon.stub(errorHandler, 'handleError'); + sinon.stub(createdLogger, 'debug'); sinon.stub(createdLogger, 'info'); sinon.stub(createdLogger, 'warn'); @@ -4455,7 +4445,7 @@ describe('lib/optimizely', function() { afterEach(function() { eventDispatcher.dispatchEvent.reset(); - errorHandler.handleError.restore(); + createdLogger.debug.restore(); createdLogger.info.restore(); createdLogger.warn.restore(); @@ -4972,7 +4962,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -5041,7 +5031,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -5099,7 +5089,7 @@ describe('lib/optimizely', function() { var optlyInstanceWithUserProfile = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, userProfileService: mockUserProfileServiceInstance, @@ -5526,7 +5516,7 @@ describe('lib/optimizely', function() { optlyInstanceWithUserProfile = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, userProfileService: mockUserProfileServiceInstance, @@ -5573,7 +5563,7 @@ describe('lib/optimizely', function() { optlyInstanceWithUserProfile = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, userProfileService: mockUserProfileServiceInstance, @@ -5624,7 +5614,7 @@ describe('lib/optimizely', function() { optlyInstanceWithUserProfile = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, userProfileService: mockUserProfileServiceInstance, @@ -5751,7 +5741,7 @@ describe('lib/optimizely', function() { initConfig: createProjectConfig(testData.getTestDecideProjectConfig()), }), userProfileService: userProfileServiceInstance, - errorHandler: errorHandler, + eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -5993,7 +5983,7 @@ describe('lib/optimizely', function() { initConfig: createProjectConfig(testData.getTestDecideProjectConfig()), }), userProfileService: userProfileServiceInstance, - errorHandler: errorHandler, + eventDispatcher: eventDispatcher, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -6054,7 +6044,7 @@ describe('lib/optimizely', function() { logLevel: LOG_LEVEL.INFO, logToConsole: false, }); - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger, }); var eventDispatcher = getMockEventDispatcher(); var eventProcessor = getForwardingEventProcessor( eventDispatcher, @@ -6067,7 +6057,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -6123,7 +6113,7 @@ describe('lib/optimizely', function() { }); var optlyInstance; var fakeDecisionResponse; - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger, }); var eventDispatcher = { dispatchEvent: () => Promise.resolve({ statusCode: 200 }), }; @@ -6140,7 +6130,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, isValidInstance: true, @@ -6150,7 +6140,6 @@ describe('lib/optimizely', function() { }); sandbox.stub(eventDispatcher, 'dispatchEvent'); - sandbox.stub(errorHandler, 'handleError'); sandbox.stub(createdLogger, 'log'); sandbox.stub(fns, 'uuid').returns('a68cf1ad-0393-4e18-af87-efe8f01a7c9c'); sandbox.stub(fns, 'currentTimestamp').returns(1509489766569); @@ -6171,7 +6160,6 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: getMockProjectConfigManager(), - errorHandler: errorHandler, eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -6726,7 +6714,6 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: getMockProjectConfigManager(), - errorHandler: errorHandler, eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -6770,7 +6757,6 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -8780,7 +8766,6 @@ describe('lib/optimizely', function() { it('returns null from getFeatureVariableBoolean when optimizely object is not a valid instance', function() { var instance = new Optimizely({ projectConfigManager: getMockProjectConfigManager(), - errorHandler: errorHandler, eventDispatcher: eventDispatcher, logger: createdLogger, notificationCenter, @@ -8794,7 +8779,6 @@ describe('lib/optimizely', function() { it('returns null from getFeatureVariableDouble when optimizely object is not a valid instance', function() { var instance = new Optimizely({ projectConfigManager: getMockProjectConfigManager(), - errorHandler: errorHandler, eventDispatcher: eventDispatcher, logger: createdLogger, notificationCenter, @@ -8808,7 +8792,6 @@ describe('lib/optimizely', function() { it('returns null from getFeatureVariableInteger when optimizely object is not a valid instance', function() { var instance = new Optimizely({ projectConfigManager: getMockProjectConfigManager(), - errorHandler: errorHandler, eventDispatcher: eventDispatcher, logger: createdLogger, notificationCenter, @@ -8822,7 +8805,6 @@ describe('lib/optimizely', function() { it('returns null from getFeatureVariableString when optimizely object is not a valid instance', function() { var instance = new Optimizely({ projectConfigManager: getMockProjectConfigManager(), - errorHandler: errorHandler, eventDispatcher: eventDispatcher, logger: createdLogger, notificationCenter, @@ -8836,7 +8818,6 @@ describe('lib/optimizely', function() { it('returns null from getFeatureVariableJSON when optimizely object is not a valid instance', function() { var instance = new Optimizely({ projectConfigManager: getMockProjectConfigManager(), - errorHandler: errorHandler, eventDispatcher: eventDispatcher, logger: createdLogger, notificationCenter, @@ -8856,7 +8837,7 @@ describe('lib/optimizely', function() { logToConsole: false, }); var optlyInstance; - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger, }); var eventDispatcher = { dispatchEvent: () => Promise.resolve({ statusCode: 200 }), }; @@ -8871,7 +8852,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -8882,7 +8863,6 @@ describe('lib/optimizely', function() { }); sandbox.stub(eventDispatcher, 'dispatchEvent'); - sandbox.stub(errorHandler, 'handleError'); sandbox.stub(createdLogger, 'log'); }); @@ -9002,7 +8982,7 @@ describe('lib/optimizely', function() { }); var optlyInstance; var audienceEvaluator; - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger, }); var eventDispatcher = { dispatchEvent: () => Promise.resolve({ statusCode: 200 }), }; @@ -9017,7 +8997,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -9029,7 +9009,7 @@ describe('lib/optimizely', function() { audienceEvaluator = AudienceEvaluator.prototype; sandbox.stub(eventDispatcher, 'dispatchEvent'); - sandbox.stub(errorHandler, 'handleError'); + sandbox.stub(createdLogger, 'log'); evalSpy = sandbox.spy(audienceEvaluator, 'evaluate'); }); @@ -9205,13 +9185,13 @@ describe('lib/optimizely', function() { beforeEach(function() { bucketStub = sinon.stub(bucketer, 'bucket'); - sinon.stub(errorHandler, 'handleError'); + sinon.stub(createdLogger, 'debug'); sinon.stub(createdLogger, 'info'); sinon.stub(createdLogger, 'warn'); sinon.stub(createdLogger, 'error'); sinon.stub(fns, 'uuid').returns('a68cf1ad-0393-4e18-af87-efe8f01a7c9c'); - notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + notificationCenter = createNotificationCenter({ logger: createdLogger, }); eventDispatcher = getMockEventDispatcher(); eventProcessor = getForwardingEventProcessor( eventDispatcher, @@ -9221,7 +9201,7 @@ describe('lib/optimizely', function() { afterEach(function() { eventDispatcher.dispatchEvent.reset(); bucketer.bucket.restore(); - errorHandler.handleError.restore(); + createdLogger.debug.restore(); createdLogger.info.restore(); createdLogger.warn.restore(); @@ -9255,7 +9235,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -9292,7 +9272,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, + eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -9330,14 +9310,14 @@ describe('lib/optimizely', function() { logToConsole: false, }); - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger, }); var eventDispatcher = getMockEventDispatcher(); var eventProcessor = getForwardingEventProcessor( eventDispatcher ); beforeEach(function() { - sinon.stub(errorHandler, 'handleError'); + sinon.stub(createdLogger, 'debug'); sinon.stub(createdLogger, 'info'); sinon.stub(createdLogger, 'warn'); @@ -9350,7 +9330,7 @@ describe('lib/optimizely', function() { createdLogger.warn.restore(); createdLogger.error.restore(); eventDispatcher.dispatchEvent.reset(); - errorHandler.handleError.restore(); + }); var optlyInstance; @@ -9361,7 +9341,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', - errorHandler: errorHandler, + projectConfigManager, eventProcessor, jsonSchemaValidator: jsonSchemaValidator, @@ -9380,7 +9360,6 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: getMockProjectConfigManager(), - errorHandler: errorHandler, eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -9434,7 +9413,7 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager, - errorHandler: errorHandler, + eventProcessor, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, @@ -9451,9 +9430,7 @@ describe('lib/optimizely', function() { const projectConfigManager = getMockProjectConfigManager({ onRunning: new Promise(function() {}) }); optlyInstance = new Optimizely({ - clientEngine: 'node-sdk', - errorHandler: errorHandler, - projectConfigManager, + clientEngine: 'node-sdk', projectConfigManager, jsonSchemaValidator: jsonSchemaValidator, logger: createdLogger, sdkKey: '12345', @@ -9476,7 +9453,6 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', - errorHandler: errorHandler, projectConfigManager, eventProcessor, jsonSchemaValidator: jsonSchemaValidator, @@ -9501,7 +9477,6 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', - errorHandler: errorHandler, projectConfigManager, eventProcessor, jsonSchemaValidator: jsonSchemaValidator, @@ -9523,7 +9498,6 @@ describe('lib/optimizely', function() { it('can be called several times with different timeout values and the returned promises behave correctly', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', - errorHandler: errorHandler, projectConfigManager: getMockProjectConfigManager(), eventProcessor, jsonSchemaValidator: jsonSchemaValidator, @@ -9553,7 +9527,6 @@ describe('lib/optimizely', function() { it('clears the timeout when the project config manager ready promise fulfills', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', - errorHandler: errorHandler, projectConfigManager: getMockProjectConfigManager(), eventProcessor, jsonSchemaValidator: jsonSchemaValidator, @@ -9579,7 +9552,6 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', - errorHandler: errorHandler, eventProcessor, projectConfigManager: fakeProjectConfigManager, jsonSchemaValidator: jsonSchemaValidator, @@ -9659,8 +9631,7 @@ describe('lib/optimizely', function() { var bucketStub; var fakeDecisionResponse; var eventDispatcherSpy; - var logger =createLogger(); - var errorHandler = { handleError: function() {} }; + var logger = createLogger(); var notificationCenter = createNotificationCenter({ logger }); var eventProcessor; beforeEach(function() { @@ -9677,7 +9648,6 @@ describe('lib/optimizely', function() { optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler, logger, isValidInstance: true, eventBatchSize: 1, diff --git a/lib/optimizely_user_context/index.tests.js b/lib/optimizely_user_context/index.tests.js index a71be212e..d8f4cdf09 100644 --- a/lib/optimizely_user_context/index.tests.js +++ b/lib/optimizely_user_context/index.tests.js @@ -20,7 +20,6 @@ import { NOTIFICATION_TYPES } from '../notification_center/type'; import OptimizelyUserContext from './'; import { createNotificationCenter } from '../notification_center'; import Optimizely from '../optimizely'; -import errorHandler from '../plugins/error_handler'; import { CONTROL_ATTRIBUTES, LOG_LEVEL } from '../utils/enums'; import testData from '../tests/test_data'; import { OptimizelyDecideOption } from '../shared_types'; @@ -61,7 +60,6 @@ const getOptlyInstance = ({ datafileObj, defaultDecideOptions }) => { const optlyInstance = new Optimizely({ clientEngine: 'node-sdk', projectConfigManager: mockConfigManager, - errorHandler: errorHandler, eventProcessor, logger: createdLogger, isValidInstance: true, @@ -391,7 +389,7 @@ describe('lib/optimizely_user_context', function() { describe('when valid forced decision is set', function() { var optlyInstance; - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger }); var eventDispatcher = getMockEventDispatcher(); var eventProcessor = getForwardingEventProcessor( eventDispatcher, @@ -402,7 +400,6 @@ describe('lib/optimizely_user_context', function() { projectConfigManager: getMockProjectConfigManager({ initConfig: createProjectConfig(testData.getTestDecideProjectConfig()) }), - errorHandler: errorHandler, eventProcessor, isValidInstance: true, logger: createdLogger, @@ -745,7 +742,7 @@ describe('lib/optimizely_user_context', function() { describe('when invalid forced decision is set', function() { var optlyInstance; - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger }); var eventDispatcher = getMockEventDispatcher(); var eventProcessor = getForwardingEventProcessor( eventDispatcher, @@ -756,7 +753,6 @@ describe('lib/optimizely_user_context', function() { projectConfigManager: getMockProjectConfigManager({ initConfig: createProjectConfig(testData.getTestDecideProjectConfig()) }), - errorHandler: errorHandler, eventProcessor, isValidInstance: true, logger: createdLogger, @@ -852,7 +848,7 @@ describe('lib/optimizely_user_context', function() { logLevel: LOG_LEVEL.DEBUG, logToConsole: false, }); - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger }); var eventDispatcher = getMockEventDispatcher(); var eventProcessor = getForwardingEventProcessor( eventDispatcher, @@ -863,7 +859,6 @@ describe('lib/optimizely_user_context', function() { projectConfigManager: getMockProjectConfigManager({ initConfig: createProjectConfig(testData.getTestDecideProjectConfig()) }), - errorHandler: errorHandler, eventProcessor, isValidInstance: true, logger: createdLogger, @@ -900,7 +895,7 @@ describe('lib/optimizely_user_context', function() { logLevel: LOG_LEVEL.DEBUG, logToConsole: false, }); - var notificationCenter = createNotificationCenter({ logger: createdLogger, errorHandler: errorHandler }); + var notificationCenter = createNotificationCenter({ logger: createdLogger }); var eventDispatcher = getMockEventDispatcher(); var eventProcessor = getForwardingEventProcessor( eventDispatcher, @@ -910,7 +905,6 @@ describe('lib/optimizely_user_context', function() { projectConfigManager: getMockProjectConfigManager({ initConfig: createProjectConfig(testData.getTestDecideProjectConfig()) }), - errorHandler: errorHandler, eventProcessor, isValidInstance: true, logger: createdLogger, diff --git a/lib/plugins/error_handler/index.tests.js b/lib/plugins/error_handler/index.tests.js deleted file mode 100644 index b3a632b92..000000000 --- a/lib/plugins/error_handler/index.tests.js +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright 2016, 2020 Optimizely - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import { assert } from 'chai'; - -import { handleError } from './'; - -describe('lib/plugins/error_handler', function() { - describe('APIs', function() { - describe('handleError', function() { - it('should just be a no-op function', function() { - assert.isFunction(handleError); - }); - }); - }); -}); diff --git a/lib/plugins/error_handler/index.ts b/lib/plugins/error_handler/index.ts deleted file mode 100644 index 7afb8c5e3..000000000 --- a/lib/plugins/error_handler/index.ts +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright 2016, 2020-2021, Optimizely - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Default error handler implementation - */ -export function handleError(): void { - // no-op -} - -export default { - handleError, -} diff --git a/lib/plugins/logger/index.react_native.tests.js b/lib/plugins/logger/index.react_native.tests.js deleted file mode 100644 index ad18ddad4..000000000 --- a/lib/plugins/logger/index.react_native.tests.js +++ /dev/null @@ -1,82 +0,0 @@ -// /** -// * Copyright 2019-2020 Optimizely -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -// import sinon from 'sinon'; -// import { assert } from 'chai'; - -// import { createLogger } from './index.react_native'; -// import { LOG_LEVEL } from '../../utils/enums'; - -// describe('lib/plugins/logger/react_native', function() { -// describe('APIs', function() { -// var defaultLogger; -// describe('createLogger', function() { -// it('should return an instance of the default logger', function() { -// defaultLogger = createLogger(); -// assert.isObject(defaultLogger); -// }); -// }); - -// describe('log', function() { -// beforeEach(function() { -// defaultLogger = createLogger(); - -// sinon.stub(console, 'log'); -// sinon.stub(console, 'info'); -// sinon.stub(console, 'warn'); -// sinon.stub(console, 'error'); -// }); - -// afterEach(function() { -// console.log.restore(); -// console.info.restore(); -// console.warn.restore(); -// console.error.restore(); -// }); - -// it('should use console.info when log level is info', function() { -// defaultLogger.log(LOG_LEVEL.INFO, 'message'); -// sinon.assert.calledWithExactly(console.info, sinon.match(/.*INFO.*message.*/)); -// sinon.assert.notCalled(console.log); -// sinon.assert.notCalled(console.warn); -// sinon.assert.notCalled(console.error); -// }); - -// it('should use console.log when log level is debug', function() { -// defaultLogger.log(LOG_LEVEL.DEBUG, 'message'); -// sinon.assert.calledWithExactly(console.log, sinon.match(/.*DEBUG.*message.*/)); -// sinon.assert.notCalled(console.info); -// sinon.assert.notCalled(console.warn); -// sinon.assert.notCalled(console.error); -// }); - -// it('should use console.warn when log level is warn', function() { -// defaultLogger.log(LOG_LEVEL.WARNING, 'message'); -// sinon.assert.calledWithExactly(console.warn, sinon.match(/.*WARNING.*message.*/)); -// sinon.assert.notCalled(console.log); -// sinon.assert.notCalled(console.info); -// sinon.assert.notCalled(console.error); -// }); - -// it('should use console.warn when log level is error', function() { -// defaultLogger.log(LOG_LEVEL.ERROR, 'message'); -// sinon.assert.calledWithExactly(console.warn, sinon.match(/.*ERROR.*message.*/)); -// sinon.assert.notCalled(console.log); -// sinon.assert.notCalled(console.info); -// sinon.assert.notCalled(console.error); -// }); -// }); -// }); -// }); diff --git a/lib/plugins/logger/index.react_native.ts b/lib/plugins/logger/index.react_native.ts deleted file mode 100644 index 816944a15..000000000 --- a/lib/plugins/logger/index.react_native.ts +++ /dev/null @@ -1,60 +0,0 @@ -// /** -// * Copyright 2019-2022, Optimizely -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -// import { LogLevel } from '../../modules/logging'; -// import { sprintf } from '../../utils/fns'; -// import { NoOpLogger } from './index'; - -// function getLogLevelName(level: number): string { -// switch (level) { -// case LogLevel.INFO: -// return 'INFO'; -// case LogLevel.ERROR: -// return 'ERROR'; -// case LogLevel.WARNING: -// return 'WARNING'; -// case LogLevel.DEBUG: -// return 'DEBUG'; -// default: -// return 'NOTSET'; -// } -// } - -// class ReactNativeLogger { -// log(level: number, message: string): void { -// const formattedMessage = sprintf('[OPTIMIZELY] - %s %s %s', getLogLevelName(level), new Date().toISOString(), message); -// switch (level) { -// case LogLevel.INFO: -// console.info(formattedMessage); -// break; -// case LogLevel.ERROR: -// case LogLevel.WARNING: -// console.warn(formattedMessage); -// break; -// case LogLevel.DEBUG: -// case LogLevel.NOTSET: -// console.log(formattedMessage); -// break; -// } -// } -// } - -// export function createLogger(): ReactNativeLogger { -// return new ReactNativeLogger(); -// } - -// export function createNoOpLogger(): NoOpLogger { -// return new NoOpLogger(); -// } diff --git a/lib/plugins/logger/index.tests.js b/lib/plugins/logger/index.tests.js deleted file mode 100644 index cf153a2f0..000000000 --- a/lib/plugins/logger/index.tests.js +++ /dev/null @@ -1,112 +0,0 @@ -// /** -// * Copyright 2016, 2020, Optimizely -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -// import { assert, expect } from 'chai'; -// import sinon from 'sinon'; - -// import { createLogger } from './'; -// import { LOG_LEVEL } from '../../utils/enums';; - -// describe('lib/plugins/logger', function() { -// describe('APIs', function() { -// var defaultLogger; -// describe('createLogger', function() { -// it('should return an instance of the default logger', function() { -// defaultLogger = createLogger({ logLevel: LOG_LEVEL.NOTSET }); -// assert.isObject(defaultLogger); -// expect(defaultLogger.logLevel).to.equal(LOG_LEVEL.NOTSET); -// }); -// }); - -// describe('log', function() { -// beforeEach(function() { -// defaultLogger = createLogger({ logLevel: LOG_LEVEL.INFO }); - -// sinon.stub(console, 'log'); -// sinon.stub(console, 'info'); -// sinon.stub(console, 'warn'); -// sinon.stub(console, 'error'); -// }); - -// afterEach(function() { -// console.log.restore(); -// console.info.restore(); -// console.warn.restore(); -// console.error.restore(); -// }); - -// it('should log a message at the threshold log level', function() { -// defaultLogger.log(LOG_LEVEL.INFO, 'message'); - -// sinon.assert.notCalled(console.log); -// sinon.assert.calledOnce(console.info); -// sinon.assert.calledWithExactly(console.info, sinon.match(/.*INFO.*message.*/)); -// sinon.assert.notCalled(console.warn); -// sinon.assert.notCalled(console.error); -// }); - -// it('should log a message if its log level is higher than the threshold log level', function() { -// defaultLogger.log(LOG_LEVEL.WARNING, 'message'); - -// sinon.assert.notCalled(console.log); -// sinon.assert.notCalled(console.info); -// sinon.assert.calledOnce(console.warn); -// sinon.assert.calledWithExactly(console.warn, sinon.match(/.*WARN.*message.*/)); -// sinon.assert.notCalled(console.error); -// }); - -// it('should not log a message if its log level is lower than the threshold log level', function() { -// defaultLogger.log(LOG_LEVEL.DEBUG, 'message'); - -// sinon.assert.notCalled(console.log); -// sinon.assert.notCalled(console.info); -// sinon.assert.notCalled(console.warn); -// sinon.assert.notCalled(console.error); -// }); -// }); - -// describe('setLogLevel', function() { -// beforeEach(function() { -// defaultLogger = createLogger({ logLevel: LOG_LEVEL.NOTSET }); -// }); - -// it('should set the log level to the specified log level', function() { -// expect(defaultLogger.logLevel).to.equal(LOG_LEVEL.NOTSET); - -// defaultLogger.setLogLevel(LOG_LEVEL.DEBUG); -// expect(defaultLogger.logLevel).to.equal(LOG_LEVEL.DEBUG); - -// defaultLogger.setLogLevel(LOG_LEVEL.INFO); -// expect(defaultLogger.logLevel).to.equal(LOG_LEVEL.INFO); -// }); - -// it('should set the log level to the ERROR when log level is not specified', function() { -// defaultLogger.setLogLevel(); -// expect(defaultLogger.logLevel).to.equal(LOG_LEVEL.ERROR); -// }); - -// it('should set the log level to the ERROR when log level is not valid', function() { -// defaultLogger.setLogLevel(-123); -// expect(defaultLogger.logLevel).to.equal(LOG_LEVEL.ERROR); - -// defaultLogger.setLogLevel(undefined); -// expect(defaultLogger.logLevel).to.equal(LOG_LEVEL.ERROR); - -// defaultLogger.setLogLevel('abc'); -// expect(defaultLogger.logLevel).to.equal(LOG_LEVEL.ERROR); -// }); -// }); -// }); -// });