Upgrade jest

Had to do this sooner or later: done() signature changed; any argument
will be treated as a failure.

Note: coverage broken until we/they update istanbul-coverage
(jestjs/jest#5772)

package.json

@@ -70,7 +70,7 @@
  "fs-extra": "3.0.1",
  "html-webpack-plugin": "^2.30.1",
  "icon-gen": "^1.0.7",
- "jest": "20.0.4",
+ "jest": "^22.4.3",
  "jest-fetch-mock": "^1.4.2",
  "jsdoc": "^3.4.3",
  "jsdoc-babel": "^0.3.0",

src/main/data-managers/__tests__/DeviceManager-test.js

@@ -15,7 +15,7 @@ describe('the DeviceManager', () => {
  it('creates a new device', (done) => {
  deviceManager.createDeviceDocument(mockSaltHex, mockSecretHex)
  .then(doc => expect(doc).toHaveProperty('_id'))
- .then(done);
+ .then(() => done());
  });
 
  it('will not create without a valid salt', async () => {
@@ -31,13 +31,10 @@ describe('the DeviceManager', () => {
  it('will not create with a short secret');
  it('will not create with a short salt');
 
- it('loads all devices', (done) => {
- deviceManager.createDeviceDocument(mockSaltHex, mockSecretHex)
- .then(() => deviceManager.fetchDeviceList())
- .then((devices) => {
- expect(devices).toBeInstanceOf(Array);
- expect(devices.length).toBe(1);
- })
- .then(done);
+ it('loads all devices', async () => {
+ await deviceManager.createDeviceDocument(mockSaltHex, mockSecretHex);
+ const devices = await deviceManager.fetchDeviceList();
+ expect(devices).toBeInstanceOf(Array);
+ expect(devices.length).toBe(1);
  });
 });

src/main/worker/__tests__/DeviceAPI-test.js

@@ -13,8 +13,6 @@ jest.mock('../pairingRequestService');
 
 describe('the DeviceAPI', () => {
  const dataDir = '';
- // let mockPairingDbRecord;
- // const send = 'json'; // the send method used in restify response handlers
 
  describe('out-of-band IPC delegate', () => {
  let consoleError;
@@ -45,11 +43,11 @@ describe('the DeviceAPI', () => {
 
  beforeEach((done) => {
  deviceApi = new DeviceAPI(dataDir, mockDelegate);
- deviceApi.listen(testPortNumber).then(done);
+ deviceApi.listen(testPortNumber).then(() => done());
  });
 
  afterEach((done) => {
- deviceApi.close().then(done);
+ deviceApi.close().then(() => done());
  });
 
  describe('GET /devices/new', () => {
@@ -68,7 +66,7 @@ describe('the DeviceAPI', () => {
 
  describe('POST /devices', () => {
  beforeEach(() => {
- // Note: mockReturnValue(Promise.reject(...))  triggers UnhandledPromiseRejectionWarning
+ // Note: mockRejectedValue() triggers UnhandledPromiseRejectionWarning
  deviceApi.requestService.verifyRequest.mockImplementation(() => (
  Promise.reject(new RequestError())
  ));

src/main/worker/__tests__/Server-test.js

@@ -49,8 +49,7 @@ describe('Server', () => {
  beforeEach((done) => {
  server = new Server();
  deviceService = new DeviceService({});
- deviceService.start()
- .then(done);
+ deviceService.start().then(() => done());
  });
 
  afterEach(() => deviceService.stop());

src/main/worker/__tests__/adminService-test.js

@@ -26,7 +26,7 @@ describe('the AdminService', () => {
  });
 
  afterEach((done) => {
- adminService.stop().then(done);
+ adminService.stop().then(() => done());
  });
 
  it('defines an API', () => {
@@ -52,7 +52,7 @@ describe('the AdminService', () => {
  let otherService;
 
  beforeEach((done) => {
- otherService = new net.Server().listen(testPortNumber, 'localhost', done);
+ otherService = new net.Server().listen(testPortNumber, 'localhost', () => done());
  });
 
  afterEach(() => {
@@ -68,7 +68,7 @@ describe('the AdminService', () => {
  });
 
  describe('running', () => {
- beforeEach(done => adminService.start(testPortNumber).then(done));
+ beforeEach(done => adminService.start(testPortNumber).then(() => done()));
 
  describe('/health', () => {
  const endpoint = makeUrl('/health', apiBase);

src/main/worker/__tests__/pairingCodeFactory-test.js

@@ -3,11 +3,8 @@
 const Factory = require('../pairingCodeFactory');
 
 describe('the PairingCodeFactory', () => {
- it('can generate a pairing code', (done) => {
- Factory.generatePairingCodeAsync()
- .then((code) => {
- expect(code).toEqual(expect.any(String));
- })
- .then(done);
+ it('can generate a pairing code', async () => {
+ const code = await Factory.generatePairingCodeAsync();
+ expect(code).toEqual(expect.any(String));
  });
 });

src/main/worker/__tests__/pairingRequestService-test.js

@@ -24,11 +24,10 @@ describe('PairingRequest Service', () => {
  });
  });
 
- it('verifies an existing request', (done) => {
- reqSvc.createRequest()
- .then(req => reqSvc.verifyRequest(req._id, req.pairingCode))
- .then(resp => expect(resp))
- .then(done);
+ it('verifies an existing request', async () => {
+ const req = await reqSvc.createRequest();
+ expect(reqSvc.verifyRequest(req._id, req.pairingCode)).resolves
+ .toMatchObject({ pairingCode: expect.any(String) });
  });
 
  it('rejects a missing or expired request', async () => {

src/renderer/components/__tests__/__snapshots__/MenuItem-test.js.snap

@@ -6,9 +6,9 @@ ShallowWrapper {
  Symbol(enzyme.__root__): [Circular],
  Symbol(enzyme.__unrendered__): <MenuItem
  action={[Function]}
->
+ >
  Foo
-</MenuItem>,
+ </MenuItem>,
  Symbol(enzyme.__renderer__): Object {
  "batchedUpdates": [Function],
  "getNode": [Function],

src/renderer/components/__tests__/__snapshots__/PanelItem-test.js.snap

@@ -7,7 +7,7 @@ ShallowWrapper {
  Symbol(enzyme.__unrendered__): <PanelItem
  label="foo"
  value="bar"
-/>,
+ />,
  Symbol(enzyme.__renderer__): Object {
  "batchedUpdates": [Function],
  "getNode": [Function],
@@ -23,14 +23,14 @@ ShallowWrapper {
  "children": Array [
  <div
  className="panel-item__label"
->
+ >
  foo
-</div>,
+ </div>,
  <div
  className="panel-item__value"
->
+ >
  bar
-</div>,
+ </div>,
  ],
  "className": "panel-item",
  },
@@ -72,14 +72,14 @@ ShallowWrapper {
  "children": Array [
  <div
  className="panel-item__label"
->
+ >
  foo
-</div>,
+ </div>,
  <div
  className="panel-item__value"
->
+ >
  bar
-</div>,
+ </div>,
  ],
  "className": "panel-item",
  },

src/renderer/components/__tests__/__snapshots__/ServerPanel-test.js.snap

@@ -7,14 +7,14 @@ ShallowWrapper {
  Symbol(enzyme.__unrendered__): <ServerPanel
  className=""
  serverOverview={
-  Object {
-  "clients": 0,
-  "ip": "x.x.x.x",
-  "publicKey": "",
-  "uptime": 0,
-  }
+ Object {
+ "clients": 0,
+ "ip": "x.x.x.x",
+ "publicKey": "",
+ "uptime": 0,
+ }
  }
-/>,
+ />,
  Symbol(enzyme.__renderer__): Object {
  "batchedUpdates": [Function],
  "getNode": [Function],
@@ -31,15 +31,15 @@ ShallowWrapper {
  <PanelItem
  label="Server Public IP"
  value="\\"x.x.x.x\\""
-/>,
+ />,
  <PanelItem
  label="Uptime"
  value={0}
-/>,
+ />,
  <PanelItem
  label="Server Public Key"
  value=""
-/>,
+ />,
  ],
  "className": "server-panel ",
  },
@@ -94,15 +94,15 @@ ShallowWrapper {
  <PanelItem
  label="Server Public IP"
  value="\\"x.x.x.x\\""
-/>,
+ />,
  <PanelItem
  label="Uptime"
  value={0}
-/>,
+ />,
  <PanelItem
  label="Server Public Key"
  value=""
-/>,
+ />,
  ],
  "className": "server-panel ",
  },

src/renderer/ui/__tests__/__snapshots__/Expandable-test.js.snap

@@ -7,9 +7,9 @@ ShallowWrapper {
  Symbol(enzyme.__unrendered__): <Expandable
  className="foo"
  open={false}
->
+ >
  Bar
-</Expandable>,
+ </Expandable>,
  Symbol(enzyme.__renderer__): Object {
  "batchedUpdates": [Function],
  "getNode": [Function],

src/renderer/utils/__tests__/adminApiClient-test.js

@@ -12,15 +12,12 @@ describe('an AdminApiClient', () => {
  fetch.resetMocks();
  });
 
- it('can get the server status', (done) => {
+ it('can get the server status', async () => {
  const mockStatus = { uptime: 100 };
  fetch.mockResponse(JSON.stringify({ serverStatus: mockStatus }));
- client.get('/health')
- .then((data) => {
- expect(data).toHaveProperty('serverStatus');
- expect(data.serverStatus).toMatchObject(mockStatus);
- })
- .then(done);
+ const data = await client.get('/health');
+ expect(data).toHaveProperty('serverStatus');
+ expect(data.serverStatus).toMatchObject(mockStatus);
  });
 
  it('can post data', async () => {