Skip to content

chore(datafile manager): Lint and formatting fixes for datafile manager tests #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2020
Merged

chore(datafile manager): Lint and formatting fixes for datafile manager tests #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions packages/datafile-manager/__test__/backoffController.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,50 +14,50 @@
* limitations under the License.
*/

import BackoffController from '../src/backoffController'
import BackoffController from '../src/backoffController';

describe('backoffController', () => {
describe('getDelay', () => {
it('returns 0 from getDelay if there have been no errors', () => {
const controller = new BackoffController()
expect(controller.getDelay()).toBe(0)
})
const controller = new BackoffController();
expect(controller.getDelay()).toBe(0);
});

it('increases the delay returned from getDelay (up to a maximum value) after each call to countError', () => {
const controller = new BackoffController()
controller.countError()
expect(controller.getDelay()).toBeGreaterThanOrEqual(8000)
expect(controller.getDelay()).toBeLessThan(9000)
controller.countError()
expect(controller.getDelay()).toBeGreaterThanOrEqual(16000)
expect(controller.getDelay()).toBeLessThan(17000)
controller.countError()
expect(controller.getDelay()).toBeGreaterThanOrEqual(32000)
expect(controller.getDelay()).toBeLessThan(33000)
controller.countError()
expect(controller.getDelay()).toBeGreaterThanOrEqual(64000)
expect(controller.getDelay()).toBeLessThan(65000)
controller.countError()
expect(controller.getDelay()).toBeGreaterThanOrEqual(128000)
expect(controller.getDelay()).toBeLessThan(129000)
controller.countError()
expect(controller.getDelay()).toBeGreaterThanOrEqual(256000)
expect(controller.getDelay()).toBeLessThan(257000)
controller.countError()
expect(controller.getDelay()).toBeGreaterThanOrEqual(512000)
expect(controller.getDelay()).toBeLessThan(513000)
const controller = new BackoffController();
controller.countError();
expect(controller.getDelay()).toBeGreaterThanOrEqual(8000);
expect(controller.getDelay()).toBeLessThan(9000);
controller.countError();
expect(controller.getDelay()).toBeGreaterThanOrEqual(16000);
expect(controller.getDelay()).toBeLessThan(17000);
controller.countError();
expect(controller.getDelay()).toBeGreaterThanOrEqual(32000);
expect(controller.getDelay()).toBeLessThan(33000);
controller.countError();
expect(controller.getDelay()).toBeGreaterThanOrEqual(64000);
expect(controller.getDelay()).toBeLessThan(65000);
controller.countError();
expect(controller.getDelay()).toBeGreaterThanOrEqual(128000);
expect(controller.getDelay()).toBeLessThan(129000);
controller.countError();
expect(controller.getDelay()).toBeGreaterThanOrEqual(256000);
expect(controller.getDelay()).toBeLessThan(257000);
controller.countError();
expect(controller.getDelay()).toBeGreaterThanOrEqual(512000);
expect(controller.getDelay()).toBeLessThan(513000);
// Maximum reached - additional errors should not increase the delay further
controller.countError()
expect(controller.getDelay()).toBeGreaterThanOrEqual(512000)
expect(controller.getDelay()).toBeLessThan(513000)
})
controller.countError();
expect(controller.getDelay()).toBeGreaterThanOrEqual(512000);
expect(controller.getDelay()).toBeLessThan(513000);
});

it('resets the error count when reset is called', () => {
const controller = new BackoffController()
controller.countError()
expect(controller.getDelay()).toBeGreaterThan(0)
controller.reset()
expect(controller.getDelay()).toBe(0)
})
})
})
const controller = new BackoffController();
controller.countError();
expect(controller.getDelay()).toBeGreaterThan(0);
controller.reset();
expect(controller.getDelay()).toBe(0);
});
});
});
82 changes: 41 additions & 41 deletions packages/datafile-manager/__test__/browserDatafileManager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
* limitations under the License.
*/

import BrowserDatafileManager from '../src/browserDatafileManager'
import * as browserRequest from '../src/browserRequest'
import { Headers, AbortableRequest } from '../src/http'
import BrowserDatafileManager from '../src/browserDatafileManager';
import * as browserRequest from '../src/browserRequest';
import { Headers, AbortableRequest } from '../src/http';
import { advanceTimersByTime, getTimerCount } from './testUtils';

describe('browserDatafileManager', () => {
let makeGetRequestSpy: jest.SpyInstance<AbortableRequest, [string, Headers]>
let makeGetRequestSpy: jest.SpyInstance<AbortableRequest, [string, Headers]>;
beforeEach(() => {
jest.useFakeTimers()
makeGetRequestSpy = jest.spyOn(browserRequest, 'makeGetRequest')
})
jest.useFakeTimers();
makeGetRequestSpy = jest.spyOn(browserRequest, 'makeGetRequest');
});

afterEach(() => {
jest.restoreAllMocks()
jest.clearAllTimers()
})
jest.restoreAllMocks();
jest.clearAllTimers();
});

it('calls makeGetRequest when started', async () => {
makeGetRequestSpy.mockReturnValue({
Expand All @@ -38,21 +38,21 @@ describe('browserDatafileManager', () => {
statusCode: 200,
body: '{"foo":"bar"}',
headers: {},
})
})
}),
});

const manager = new BrowserDatafileManager({
sdkKey: '1234',
autoUpdate: false,
})
manager.start()
expect(makeGetRequestSpy).toBeCalledTimes(1)
expect(makeGetRequestSpy.mock.calls[0][0]).toBe('https://cdn.optimizely.com/datafiles/1234.json')
expect(makeGetRequestSpy.mock.calls[0][1]).toEqual({})
});
manager.start();
expect(makeGetRequestSpy).toBeCalledTimes(1);
expect(makeGetRequestSpy.mock.calls[0][0]).toBe('https://cdn.optimizely.com/datafiles/1234.json');
expect(makeGetRequestSpy.mock.calls[0][1]).toEqual({});

await manager.onReady()
await manager.stop()
})
await manager.onReady();
await manager.stop();
});

it('calls makeGetRequest for live update requests', async () => {
makeGetRequestSpy.mockReturnValue({
Expand All @@ -63,23 +63,23 @@ describe('browserDatafileManager', () => {
headers: {
'last-modified': 'Fri, 08 Mar 2019 18:57:17 GMT',
},
})
})
}),
});
const manager = new BrowserDatafileManager({
sdkKey: '1234',
autoUpdate: true,
})
manager.start()
await manager.onReady()
await advanceTimersByTime(300000)
expect(makeGetRequestSpy).toBeCalledTimes(2)
expect(makeGetRequestSpy.mock.calls[1][0]).toBe('https://cdn.optimizely.com/datafiles/1234.json')
});
manager.start();
await manager.onReady();
await advanceTimersByTime(300000);
expect(makeGetRequestSpy).toBeCalledTimes(2);
expect(makeGetRequestSpy.mock.calls[1][0]).toBe('https://cdn.optimizely.com/datafiles/1234.json');
expect(makeGetRequestSpy.mock.calls[1][1]).toEqual({
'if-modified-since': 'Fri, 08 Mar 2019 18:57:17 GMT'
})
'if-modified-since': 'Fri, 08 Mar 2019 18:57:17 GMT',
});

await manager.stop()
})
await manager.stop();
});

it('defaults to false for autoUpdate', async () => {
makeGetRequestSpy.mockReturnValue({
Expand All @@ -90,16 +90,16 @@ describe('browserDatafileManager', () => {
headers: {
'last-modified': 'Fri, 08 Mar 2019 18:57:17 GMT',
},
})
})
}),
});
const manager = new BrowserDatafileManager({
sdkKey: '1234',
})
manager.start()
await manager.onReady()
});
manager.start();
await manager.onReady();
// Should not set a timeout for a later update
expect(getTimerCount()).toBe(0)
expect(getTimerCount()).toBe(0);

await manager.stop()
})
})
await manager.stop();
});
});
116 changes: 55 additions & 61 deletions packages/datafile-manager/__test__/browserRequest.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,122 +17,116 @@
* limitations under the License.
*/

import {
FakeXMLHttpRequest,
FakeXMLHttpRequestStatic,
fakeXhr
} from 'nise'
import { makeGetRequest } from '../src/browserRequest'
import { FakeXMLHttpRequest, FakeXMLHttpRequestStatic, fakeXhr } from 'nise';
import { makeGetRequest } from '../src/browserRequest';

describe('browserRequest', () => {
describe('makeGetRequest', () => {
let mockXHR: FakeXMLHttpRequestStatic
let xhrs: FakeXMLHttpRequest[]
let mockXHR: FakeXMLHttpRequestStatic;
let xhrs: FakeXMLHttpRequest[];
beforeEach(() => {
xhrs = []
mockXHR = fakeXhr.useFakeXMLHttpRequest()
mockXHR.onCreate = req => xhrs.push(req)
})
xhrs = [];
mockXHR = fakeXhr.useFakeXMLHttpRequest();
mockXHR.onCreate = (req): number => xhrs.push(req);
});

afterEach(() => {
mockXHR.restore()
})
mockXHR.restore();
});

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

expect(xhrs.length).toBe(1)
const xhr = xhrs[0]
const { url, method } = xhr
expect(xhrs.length).toBe(1);
const xhr = xhrs[0];
const { url, method } = xhr;
expect({ url, method }).toEqual({
url: 'https://cdn.optimizely.com/datafiles/123.json',
method: 'GET',
})
});

xhr.respond(200, {}, '{"foo":"bar"}')
xhr.respond(200, {}, '{"foo":"bar"}');

await req.responsePromise
})
await req.responsePromise;
});

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

const xhr = xhrs[0]
xhr.respond(200, {}, '{"foo":"bar"}')
const xhr = xhrs[0];
xhr.respond(200, {}, '{"foo":"bar"}');

const resp = await req.responsePromise
const resp = await req.responsePromise;
expect(resp).toEqual({
statusCode: 200,
headers: {},
body: '{"foo":"bar"}',
})
})
});
});

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

const xhr = xhrs[0]
xhr.respond(404, {}, '')
const xhr = xhrs[0];
xhr.respond(404, {}, '');

const resp = await req.responsePromise
const resp = await req.responsePromise;
expect(resp).toEqual({
statusCode: 404,
headers: {},
body: '',
})
})
});
});

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

expect(xhrs.length).toBe(1)
expect(xhrs[0].requestHeaders['if-modified-since']).toBe(
'Fri, 08 Mar 2019 18:57:18 GMT',
)
expect(xhrs.length).toBe(1);
expect(xhrs[0].requestHeaders['if-modified-since']).toBe('Fri, 08 Mar 2019 18:57:18 GMT');

xhrs[0].respond(404, {}, '')
xhrs[0].respond(404, {}, '');

await req.responsePromise
})
await req.responsePromise;
});

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

const xhr = xhrs[0]
const xhr = xhrs[0];
xhr.respond(
200,
{
'content-type': 'application/json',
'last-modified': 'Fri, 08 Mar 2019 18:57:18 GMT',
},
'{"foo":"bar"}',
)
'{"foo":"bar"}'
);

const resp = await req.responsePromise
const resp = await req.responsePromise;
expect(resp).toEqual({
statusCode: 200,
body: '{"foo":"bar"}',
headers: {
'content-type': 'application/json',
'last-modified': 'Fri, 08 Mar 2019 18:57:18 GMT',
},
})
})
});
});

it('returns a rejected promise when there is a request error', async () => {
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {})
xhrs[0].error()
await expect(req.responsePromise).rejects.toThrow()
})
const req = makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {});
xhrs[0].error();
await expect(req.responsePromise).rejects.toThrow();
});

it('sets a timeout on the request object', () => {
const onCreateMock = jest.fn()
mockXHR.onCreate = onCreateMock
makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {})
expect(onCreateMock).toBeCalledTimes(1)
expect(onCreateMock.mock.calls[0][0].timeout).toBe(60000)
})
})
})
const onCreateMock = jest.fn();
mockXHR.onCreate = onCreateMock;
makeGetRequest('https://cdn.optimizely.com/datafiles/123.json', {});
expect(onCreateMock).toBeCalledTimes(1);
expect(onCreateMock.mock.calls[0][0].timeout).toBe(60000);
});
});
});
Loading