Skip to content

Commit 41e968a

Browse files
raju-optiraju-opti
committed
fix vitest
1 parent f56d91e commit 41e968a

File tree

13 files changed

+484
-507
lines changed

13 files changed

+484
-507
lines changed

‎lib/event_processor/batch_event_processor.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ describe('QueueingEventProcessor', async () => {
7676
processor.setLogger(logger);
7777
processor.start();
7878

79-
80-
expect(logger.log).toHaveBeenCalledTimes(2);
81-
expect(logger.log).toHaveBeenNthCalledWith(1, LogLevel.Warn, 'warn message', 1, 2);
82-
expect(logger.log).toHaveBeenNthCalledWith(2, LogLevel.Error, 'error message', 3, 4);
79+
expect(logger.warn).toHaveBeenCalledTimes(1);
80+
expect(logger.warn).toHaveBeenCalledWith('warn message', 1, 2);
81+
expect(logger.error).toHaveBeenCalledTimes(1);
82+
expect(logger.error).toHaveBeenCalledWith('error message', 3, 4);
8383
});
8484

8585
it('should resolve onRunning() when start() is called', async () => {

‎lib/index.react_native.spec.ts

Lines changed: 67 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
*/
1616
import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest';
1717

18-
import * as logging from './modules/logging/logger';
19-
2018
import Optimizely from './optimizely';
2119
import testData from './tests/test_data';
2220
import packageJSON from '../package.json';
2321
import optimizelyFactory from './index.react_native';
2422
import configValidator from './utils/config_validator';
2523
import { getMockProjectConfigManager } from './tests/mock/mock_project_config_manager';
2624
import { createProjectConfig } from './project_config/project_config';
25+
import { getMockLogger } from './tests/mock/mock_logger';
2726

2827
vi.mock('@react-native-community/netinfo');
2928
vi.mock('react-native-get-random-values')
@@ -41,9 +40,6 @@ describe('javascript-sdk/react-native', () => {
4140

4241
describe('APIs', () => {
4342
it('should expose logger, errorHandler, eventDispatcher and enums', () => {
44-
expect(optimizelyFactory.logging).toBeDefined();
45-
expect(optimizelyFactory.logging.createLogger).toBeDefined();
46-
expect(optimizelyFactory.logging.createNoOpLogger).toBeDefined();
4743
expect(optimizelyFactory.errorHandler).toBeDefined();
4844
expect(optimizelyFactory.eventDispatcher).toBeDefined();
4945
expect(optimizelyFactory.enums).toBeDefined();
@@ -56,29 +52,29 @@ describe('javascript-sdk/react-native', () => {
5652
} };
5753
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
5854
// @ts-ignore
59-
let silentLogger;
55+
let mockLogger;
6056

6157
beforeEach(() => {
6258
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
6359
// @ts-ignore
64-
silentLogger = optimizelyFactory.logging.createLogger();
60+
mockLogger = getMockLogger();
6561
vi.spyOn(console, 'error');
66-
vi.spyOn(configValidator, 'validate').mockImplementation(() => {
67-
throw new Error('Invalid config or something');
68-
});
6962
});
7063

7164
afterEach(() => {
7265
vi.resetAllMocks();
7366
});
7467

7568
it('should not throw if the provided config is not valid', () => {
69+
vi.spyOn(configValidator, 'validate').mockImplementation(() => {
70+
throw new Error('Invalid config or something');
71+
});
7672
expect(function() {
7773
const optlyInstance = optimizelyFactory.createInstance({
7874
projectConfigManager: getMockProjectConfigManager(),
7975
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
8076
// @ts-ignore
81-
logger: silentLogger,
77+
logger: mockLogger,
8278
});
8379
}).not.toThrow();
8480
});
@@ -89,7 +85,7 @@ describe('javascript-sdk/react-native', () => {
8985
errorHandler: fakeErrorHandler,
9086
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
9187
// @ts-ignore
92-
logger: silentLogger,
88+
logger: mockLogger,
9389
});
9490

9591
expect(optlyInstance).toBeInstanceOf(Optimizely);
@@ -104,7 +100,7 @@ describe('javascript-sdk/react-native', () => {
104100
errorHandler: fakeErrorHandler,
105101
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
106102
// @ts-ignore
107-
logger: silentLogger,
103+
logger: mockLogger,
108104
});
109105
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
110106
// @ts-ignore
@@ -114,64 +110,64 @@ describe('javascript-sdk/react-native', () => {
114110
expect(packageJSON.version).toEqual(optlyInstance.clientVersion);
115111
});
116112

117-
it('should allow passing of "react-sdk" as the clientEngine and convert it to "react-native-sdk"', () => {
118-
const optlyInstance = optimizelyFactory.createInstance({
119-
clientEngine: 'react-sdk',
120-
projectConfigManager: getMockProjectConfigManager(),
121-
errorHandler: fakeErrorHandler,
122-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
123-
// @ts-ignore
124-
logger: silentLogger,
125-
});
126-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
127-
// @ts-ignore
128-
expect('react-native-sdk').toEqual(optlyInstance.clientEngine);
129-
});
130-
131-
describe('when passing in logLevel', () => {
132-
beforeEach(() => {
133-
vi.spyOn(logging, 'setLogLevel');
134-
});
135-
136-
afterEach(() => {
137-
vi.resetAllMocks();
138-
});
139-
140-
it('should call logging.setLogLevel', () => {
141-
optimizelyFactory.createInstance({
142-
projectConfigManager: getMockProjectConfigManager({
143-
initConfig: createProjectConfig(testData.getTestProjectConfig()),
144-
}),
145-
logLevel: optimizelyFactory.enums.LOG_LEVEL.ERROR,
146-
});
147-
expect(logging.setLogLevel).toBeCalledTimes(1);
148-
expect(logging.setLogLevel).toBeCalledWith(optimizelyFactory.enums.LOG_LEVEL.ERROR);
149-
});
150-
});
151-
152-
describe('when passing in logger', () => {
153-
beforeEach(() => {
154-
vi.spyOn(logging, 'setLogHandler');
155-
});
156-
157-
afterEach(() => {
158-
vi.resetAllMocks();
159-
});
160-
161-
it('should call logging.setLogHandler with the supplied logger', () => {
162-
const fakeLogger = { log: function() {} };
163-
optimizelyFactory.createInstance({
164-
projectConfigManager: getMockProjectConfigManager({
165-
initConfig: createProjectConfig(testData.getTestProjectConfig()),
166-
}),
167-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
168-
// @ts-ignore
169-
logger: fakeLogger,
170-
});
171-
expect(logging.setLogHandler).toBeCalledTimes(1);
172-
expect(logging.setLogHandler).toBeCalledWith(fakeLogger);
173-
});
174-
});
113+
// it('should allow passing of "react-sdk" as the clientEngine and convert it to "react-native-sdk"', () => {
114+
// const optlyInstance = optimizelyFactory.createInstance({
115+
// clientEngine: 'react-sdk',
116+
// projectConfigManager: getMockProjectConfigManager(),
117+
// errorHandler: fakeErrorHandler,
118+
// // eslint-disable-next-line @typescript-eslint/ban-ts-comment
119+
// // @ts-ignore
120+
// logger: mockLogger,
121+
// });
122+
// // eslint-disable-next-line @typescript-eslint/ban-ts-comment
123+
// // @ts-ignore
124+
// expect('react-native-sdk').toEqual(optlyInstance.clientEngine);
125+
// });
126+
127+
// describe('when passing in logLevel', () => {
128+
// beforeEach(() => {
129+
// vi.spyOn(logging, 'setLogLevel');
130+
// });
131+
132+
// afterEach(() => {
133+
// vi.resetAllMocks();
134+
// });
135+
136+
// it('should call logging.setLogLevel', () => {
137+
// optimizelyFactory.createInstance({
138+
// projectConfigManager: getMockProjectConfigManager({
139+
// initConfig: createProjectConfig(testData.getTestProjectConfig()),
140+
// }),
141+
// logLevel: optimizelyFactory.enums.LOG_LEVEL.ERROR,
142+
// });
143+
// expect(logging.setLogLevel).toBeCalledTimes(1);
144+
// expect(logging.setLogLevel).toBeCalledWith(optimizelyFactory.enums.LOG_LEVEL.ERROR);
145+
// });
146+
// });
147+
148+
// describe('when passing in logger', () => {
149+
// beforeEach(() => {
150+
// vi.spyOn(logging, 'setLogHandler');
151+
// });
152+
153+
// afterEach(() => {
154+
// vi.resetAllMocks();
155+
// });
156+
157+
// it('should call logging.setLogHandler with the supplied logger', () => {
158+
// const fakeLogger = { log: function() {} };
159+
// optimizelyFactory.createInstance({
160+
// projectConfigManager: getMockProjectConfigManager({
161+
// initConfig: createProjectConfig(testData.getTestProjectConfig()),
162+
// }),
163+
// // eslint-disable-next-line @typescript-eslint/ban-ts-comment
164+
// // @ts-ignore
165+
// logger: fakeLogger,
166+
// });
167+
// expect(logging.setLogHandler).toBeCalledTimes(1);
168+
// expect(logging.setLogHandler).toBeCalledWith(fakeLogger);
169+
// });
170+
// });
175171
});
176172
});
177173
});

0 commit comments

Comments
 (0)