add jest-circus

package.json

@@ -58,6 +58,7 @@
     "html-webpack-plugin": "^2.30.1",
     "husky": "^3.0.8",
     "jest": "^24.5.0",
+    "jest-circus": "^24.6.0",
     "lint-staged": "^7.1.0",
     "minimist": "^1.2.0",
     "prettier": "^1.12.1",

packages/dai/jest.config.js

@@ -14,5 +14,6 @@ module.exports = {
     "test"
   ],
   "setupFilesAfterEnv": ["<rootDir>/test/setup-test.js"],
+  "testRunner": "jest-circus/runner",
   "testPathIgnorePatterns": ["<rootDir>/node_modules/", "<rootDir>/test/build.spec.js", "<rootDir>/test/integration/"]
 }

packages/dai/test/eth/EthereumCdpService.spec.js

@@ -101,21 +101,19 @@ describe('find cdp', () => {
 test('can calculate system collateralization', async () => {
   const cdp = await cdpService.openCdp();
   let lock = cdp.lockEth(0.1);
-  mineBlocks(cdpService);
-  await lock;
+  await Promise.all([lock, mineBlocks(cdpService)]);
   await cdp.drawDai(1);
   const scA = await cdpService.getSystemCollateralization();
 
   lock = cdp.lockEth(0.1);
-  mineBlocks(cdpService);
-  await lock;
+  await Promise.all([lock, mineBlocks(cdpService)]);
   const scB = await cdpService.getSystemCollateralization();
   expect(scB).toBeGreaterThan(scA);
 
   await cdp.drawDai(1);
   const scC = await cdpService.getSystemCollateralization();
   expect(scC).toBeLessThan(scB);
-});
+}, 10000);
 
 test('openCdp returns the transaction object', async () => {
   const txo = cdpService.openCdp();

packages/dai/test/eth/Web3Service.spec.js

@@ -141,7 +141,7 @@ test('be authenticated and know default address when private key passed in', don
 });
 
 test('determine correct connection status', async done => {
-  const service = buildTestService();
+  const service = buildTestService(null, 200);
 
   expect(await service._isStillConnected()).toBe(false);
   await service.manager().connect();