Skip to content

Commit 1b71750

Browse files
mjc1283mjc1283
authored
chore(datafile manager): Lint and formatting fixes for datafile manager tests (#441)
Summary: - Lint and formatting fixes for datafile manager tests - Update lint package.json script to run on test files Test plan: Existing tests
1 parent 23988b1 commit 1b71750

10 files changed

+778
-778
lines changed

‎packages/datafile-manager/__test__/backoffController.spec.ts‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,50 +14,50 @@
1414
* limitations under the License.
1515
*/
1616

17-
import BackoffController from '../src/backoffController'
17+
import BackoffController from '../src/backoffController';
1818

1919
describe('backoffController', () => {
2020
describe('getDelay', () => {
2121
it('returns 0 from getDelay if there have been no errors', () => {
22-
const controller = new BackoffController()
23-
expect(controller.getDelay()).toBe(0)
24-
})
22+
const controller = new BackoffController();
23+
expect(controller.getDelay()).toBe(0);
24+
});
2525

2626
it('increases the delay returned from getDelay (up to a maximum value) after each call to countError', () => {
27-
const controller = new BackoffController()
28-
controller.countError()
29-
expect(controller.getDelay()).toBeGreaterThanOrEqual(8000)
30-
expect(controller.getDelay()).toBeLessThan(9000)
31-
controller.countError()
32-
expect(controller.getDelay()).toBeGreaterThanOrEqual(16000)
33-
expect(controller.getDelay()).toBeLessThan(17000)
34-
controller.countError()
35-
expect(controller.getDelay()).toBeGreaterThanOrEqual(32000)
36-
expect(controller.getDelay()).toBeLessThan(33000)
37-
controller.countError()
38-
expect(controller.getDelay()).toBeGreaterThanOrEqual(64000)
39-
expect(controller.getDelay()).toBeLessThan(65000)
40-
controller.countError()
41-
expect(controller.getDelay()).toBeGreaterThanOrEqual(128000)
42-
expect(controller.getDelay()).toBeLessThan(129000)
43-
controller.countError()
44-
expect(controller.getDelay()).toBeGreaterThanOrEqual(256000)
45-
expect(controller.getDelay()).toBeLessThan(257000)
46-
controller.countError()
47-
expect(controller.getDelay()).toBeGreaterThanOrEqual(512000)
48-
expect(controller.getDelay()).toBeLessThan(513000)
27+
const controller = new BackoffController();
28+
controller.countError();
29+
expect(controller.getDelay()).toBeGreaterThanOrEqual(8000);
30+
expect(controller.getDelay()).toBeLessThan(9000);
31+
controller.countError();
32+
expect(controller.getDelay()).toBeGreaterThanOrEqual(16000);
33+
expect(controller.getDelay()).toBeLessThan(17000);
34+
controller.countError();
35+
expect(controller.getDelay()).toBeGreaterThanOrEqual(32000);
36+
expect(controller.getDelay()).toBeLessThan(33000);
37+
controller.countError();
38+
expect(controller.getDelay()).toBeGreaterThanOrEqual(64000);
39+
expect(controller.getDelay()).toBeLessThan(65000);
40+
controller.countError();
41+
expect(controller.getDelay()).toBeGreaterThanOrEqual(128000);
42+
expect(controller.getDelay()).toBeLessThan(129000);
43+
controller.countError();
44+
expect(controller.getDelay()).toBeGreaterThanOrEqual(256000);
45+
expect(controller.getDelay()).toBeLessThan(257000);
46+
controller.countError();
47+
expect(controller.getDelay()).toBeGreaterThanOrEqual(512000);
48+
expect(controller.getDelay()).toBeLessThan(513000);
4949
// Maximum reached - additional errors should not increase the delay further
50-
controller.countError()
51-
expect(controller.getDelay()).toBeGreaterThanOrEqual(512000)
52-
expect(controller.getDelay()).toBeLessThan(513000)
53-
})
50+
controller.countError();
51+
expect(controller.getDelay()).toBeGreaterThanOrEqual(512000);
52+
expect(controller.getDelay()).toBeLessThan(513000);
53+
});
5454

5555
it('resets the error count when reset is called', () => {
56-
const controller = new BackoffController()
57-
controller.countError()
58-
expect(controller.getDelay()).toBeGreaterThan(0)
59-
controller.reset()
60-
expect(controller.getDelay()).toBe(0)
61-
})
62-
})
63-
})
56+
const controller = new BackoffController();
57+
controller.countError();
58+
expect(controller.getDelay()).toBeGreaterThan(0);
59+
controller.reset();
60+
expect(controller.getDelay()).toBe(0);
61+
});
62+
});
63+
});

‎packages/datafile-manager/__test__/browserDatafileManager.spec.ts‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414
* limitations under the License.
1515
*/
1616

17-
import BrowserDatafileManager from '../src/browserDatafileManager'
18-
import * as browserRequest from '../src/browserRequest'
19-
import { Headers, AbortableRequest } from '../src/http'
17+
import BrowserDatafileManager from '../src/browserDatafileManager';
18+
import * as browserRequest from '../src/browserRequest';
19+
import { Headers, AbortableRequest } from '../src/http';
2020
import { advanceTimersByTime, getTimerCount } from './testUtils';
2121

2222
describe('browserDatafileManager', () => {
23-
let makeGetRequestSpy: jest.SpyInstance<AbortableRequest, [string, Headers]>
23+
let makeGetRequestSpy: jest.SpyInstance<AbortableRequest, [string, Headers]>;
2424
beforeEach(() => {
25-
jest.useFakeTimers()
26-
makeGetRequestSpy = jest.spyOn(browserRequest, 'makeGetRequest')
27-
})
25+
jest.useFakeTimers();
26+
makeGetRequestSpy = jest.spyOn(browserRequest, 'makeGetRequest');
27+
});
2828

2929
afterEach(() => {
30-
jest.restoreAllMocks()
31-
jest.clearAllTimers()
32-
})
30+
jest.restoreAllMocks();
31+
jest.clearAllTimers();
32+
});
3333

3434
it('calls makeGetRequest when started', async () => {
3535
makeGetRequestSpy.mockReturnValue({
@@ -38,21 +38,21 @@ describe('browserDatafileManager', () => {
3838
statusCode: 200,
3939
body: '{"foo":"bar"}',
4040
headers: {},
41-
})
42-
})
41+
}),
42+
});
4343

4444
const manager = new BrowserDatafileManager({
4545
sdkKey: '1234',
4646
autoUpdate: false,
47-
})
48-
manager.start()
49-
expect(makeGetRequestSpy).toBeCalledTimes(1)
50-
expect(makeGetRequestSpy.mock.calls[0][0]).toBe('https://cdn.optimizely.com/datafiles/1234.json')
51-
expect(makeGetRequestSpy.mock.calls[0][1]).toEqual({})
47+
});
48+
manager.start();
49+
expect(makeGetRequestSpy).toBeCalledTimes(1);
50+
expect(makeGetRequestSpy.mock.calls[0][0]).toBe('https://cdn.optimizely.com/datafiles/1234.json');
51+
expect(makeGetRequestSpy.mock.calls[0][1]).toEqual({});
5252

53-
await manager.onReady()
54-
await manager.stop()
55-
})
53+
await manager.onReady();
54+
await manager.stop();
55+
});
5656

5757
it('calls makeGetRequest for live update requests', async () => {
5858
makeGetRequestSpy.mockReturnValue({
@@ -63,23 +63,23 @@ describe('browserDatafileManager', () => {
6363
headers: {
6464
'last-modified': 'Fri, 08 Mar 2019 18:57:17 GMT',
6565
},
66-
})
67-
})
66+
}),
67+
});
6868
const manager = new BrowserDatafileManager({
6969
sdkKey: '1234',
7070
autoUpdate: true,
71-
})
72-
manager.start()
73-
await manager.onReady()
74-
await advanceTimersByTime(300000)
75-
expect(makeGetRequestSpy).toBeCalledTimes(2)
76-
expect(makeGetRequestSpy.mock.calls[1][0]).toBe('https://cdn.optimizely.com/datafiles/1234.json')
71+
});
72+
manager.start();
73+
await manager.onReady();
74+
await advanceTimersByTime(300000);
75+
expect(makeGetRequestSpy).toBeCalledTimes(2);
76+
expect(makeGetRequestSpy.mock.calls[1][0]).toBe('https://cdn.optimizely.com/datafiles/1234.json');
7777
expect(makeGetRequestSpy.mock.calls[1][1]).toEqual({
78-
'if-modified-since': 'Fri, 08 Mar 2019 18:57:17 GMT'
79-
})
78+
'if-modified-since': 'Fri, 08 Mar 2019 18:57:17 GMT',
79+
});
8080

81-
await manager.stop()
82-
})
81+
await manager.stop();
82+
});
8383

8484
it('defaults to false for autoUpdate', async () => {
8585
makeGetRequestSpy.mockReturnValue({
@@ -90,16 +90,16 @@ describe('browserDatafileManager', () => {
9090
headers: {
9191
'last-modified': 'Fri, 08 Mar 2019 18:57:17 GMT',
9292
},
93-
})
94-
})
93+
}),
94+
});
9595
const manager = new BrowserDatafileManager({
9696
sdkKey: '1234',
97-
})
98-
manager.start()
99-
await manager.onReady()
97+
});
98+
manager.start();
99+
await manager.onReady();
100100
// Should not set a timeout for a later update
101-
expect(getTimerCount()).toBe(0)
101+
expect(getTimerCount()).toBe(0);
102102

103-
await manager.stop()
104-
})
105-
})
103+
await manager.stop();
104+
});
105+
});

‎packages/datafile-manager/__test__/browserRequest.spec.ts‎

Lines changed: 55 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -17,122 +17,116 @@
1717
* limitations under the License.
1818
*/
1919

20-
import {
21-
FakeXMLHttpRequest,
22-
FakeXMLHttpRequestStatic,
23-
fakeXhr
24-
} from 'nise'
25-
import { makeGetRequest } from '../src/browserRequest'
20+
import { FakeXMLHttpRequest, FakeXMLHttpRequestStatic, fakeXhr } from 'nise';
21+
import { makeGetRequest } from '../src/browserRequest';
2622

2723
describe('browserRequest', () => {
2824
describe('makeGetRequest', () => {
29-
let mockXHR: FakeXMLHttpRequestStatic
30-
let xhrs: FakeXMLHttpRequest[]
25+
let mockXHR: FakeXMLHttpRequestStatic;
26+
let xhrs: FakeXMLHttpRequest[];
3127
beforeEach(() => {
32-
xhrs = []
33-
mockXHR = fakeXhr.useFakeXMLHttpRequest()
34-
mockXHR.onCreate = req => xhrs.push(req)
35-
})
28+
xhrs = [];
29+
mockXHR = fakeXhr.useFakeXMLHttpRequest();
30+
mockXHR.onCreate = (req): number => xhrs.push(req);
31+
});
3632

3733
afterEach(() => {
38-
mockXHR.restore()
39-
})
34+
mockXHR.restore();
35+
});
4036

4137
it('makes a GET request to the argument URL', async () => {
42-
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {})
38+
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {});
4339

44-
expect(xhrs.length).toBe(1)
45-
const xhr = xhrs[0]
46-
const { url, method } = xhr
40+
expect(xhrs.length).toBe(1);
41+
const xhr = xhrs[0];
42+
const { url, method } = xhr;
4743
expect({ url, method }).toEqual({
4844
url: 'https://cdn.optimizely.com/datafiles/123.json',
4945
method: 'GET',
50-
})
46+
});
5147

52-
xhr.respond(200, {}, '{"foo":"bar"}')
48+
xhr.respond(200, {}, '{"foo":"bar"}');
5349

54-
await req.responsePromise
55-
})
50+
await req.responsePromise;
51+
});
5652

5753
it('returns a 200 response back to its superclass', async () => {
58-
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {})
54+
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {});
5955

60-
const xhr = xhrs[0]
61-
xhr.respond(200, {}, '{"foo":"bar"}')
56+
const xhr = xhrs[0];
57+
xhr.respond(200, {}, '{"foo":"bar"}');
6258

63-
const resp = await req.responsePromise
59+
const resp = await req.responsePromise;
6460
expect(resp).toEqual({
6561
statusCode: 200,
6662
headers: {},
6763
body: '{"foo":"bar"}',
68-
})
69-
})
64+
});
65+
});
7066

7167
it('returns a 404 response back to its superclass', async () => {
72-
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {})
68+
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {});
7369

74-
const xhr = xhrs[0]
75-
xhr.respond(404, {}, '')
70+
const xhr = xhrs[0];
71+
xhr.respond(404, {}, '');
7672

77-
const resp = await req.responsePromise
73+
const resp = await req.responsePromise;
7874
expect(resp).toEqual({
7975
statusCode: 404,
8076
headers: {},
8177
body: '',
82-
})
83-
})
78+
});
79+
});
8480

8581
it('includes headers from the headers argument in the request', async () => {
8682
const req = makeGetRequest('https://cdn.optimizely.com/dataifles/123.json', {
8783
'if-modified-since': 'Fri, 08 Mar 2019 18:57:18 GMT',
88-
})
84+
});
8985

90-
expect(xhrs.length).toBe(1)
91-
expect(xhrs[0].requestHeaders['if-modified-since']).toBe(
92-
'Fri, 08 Mar 2019 18:57:18 GMT',
93-
)
86+
expect(xhrs.length).toBe(1);
87+
expect(xhrs[0].requestHeaders['if-modified-since']).toBe('Fri, 08 Mar 2019 18:57:18 GMT');
9488

95-
xhrs[0].respond(404, {}, '')
89+
xhrs[0].respond(404, {}, '');
9690

97-
await req.responsePromise
98-
})
91+
await req.responsePromise;
92+
});
9993

10094
it('includes headers from the response in the eventual response in the return value', async () => {
101-
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {})
95+
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {});
10296

103-
const xhr = xhrs[0]
97+
const xhr = xhrs[0];
10498
xhr.respond(
10599
200,
106100
{
107101
'content-type': 'application/json',
108102
'last-modified': 'Fri, 08 Mar 2019 18:57:18 GMT',
109103
},
110-
'{"foo":"bar"}',
111-
)
104+
'{"foo":"bar"}'
105+
);
112106

113-
const resp = await req.responsePromise
107+
const resp = await req.responsePromise;
114108
expect(resp).toEqual({
115109
statusCode: 200,
116110
body: '{"foo":"bar"}',
117111
headers: {
118112
'content-type': 'application/json',
119113
'last-modified': 'Fri, 08 Mar 2019 18:57:18 GMT',
120114
},
121-
})
122-
})
115+
});
116+
});
123117

124118
it('returns a rejected promise when there is a request error', async () => {
125-
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {})
126-
xhrs[0].error()
127-
await expect(req.responsePromise).rejects.toThrow()
128-
})
119+
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {});
120+
xhrs[0].error();
121+
await expect(req.responsePromise).rejects.toThrow();
122+
});
129123

130124
it('sets a timeout on the request object', () => {
131-
const onCreateMock = jest.fn()
132-
mockXHR.onCreate = onCreateMock
133-
makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {})
134-
expect(onCreateMock).toBeCalledTimes(1)
135-
expect(onCreateMock.mock.calls[0][0].timeout).toBe(60000)
136-
})
137-
})
138-
})
125+
const onCreateMock = jest.fn();
126+
mockXHR.onCreate = onCreateMock;
127+
makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {});
128+
expect(onCreateMock).toBeCalledTimes(1);
129+
expect(onCreateMock.mock.calls[0][0].timeout).toBe(60000);
130+
});
131+
});
132+
});

0 commit comments

Comments
 (0)