test: fix jest usage and add retry

jest.config.js

@@ -8,5 +8,6 @@ module.exports = {
   testMatch: ['**/test/**/*.test.js'],
   setupFilesAfterEnv: ['<rootDir>/setupTest.js'],
   globalSetup: '<rootDir>/globalSetupTest.js',
+  testRunner: 'jest-circus/runner',
   testSequencer: '<rootDir>/test/testSequencer.js',
 };

package.json

@@ -92,7 +92,8 @@
     "html-loader": "^1.1.0",
     "html-webpack-plugin": "^4.3.0",
     "husky": "^4.2.5",
-    "jest": "^26.3.0",
+    "jest": "^26.6.3",
+    "jest-circus": "^26.6.3",
     "jest-junit": "^11.1.0",
     "less": "^3.12.2",
     "less-loader": "^6.2.0",

setupTest.js

@@ -2,3 +2,6 @@
 
 process.env.CHOKIDAR_USEPOLLING = true;
 jest.setTimeout(120000);
+
+// retry 3 times for flaky tests
+jest.retryTimes(3);

test/e2e/ClientOptions.test.js

@@ -400,7 +400,7 @@ describe('Client console.log', () => {
       })`;
       options = { ...mode, ...options };
       const testOptions = Object.assign({}, baseOptions, options);
-      await it(title, async (done) => {
+      await it(title, (done) => {
         testServer.startAwaitingCompilation(config, testOptions, async () => {
           const res = [];
           const { page, browser } = await runBrowser();

test/options.test.js

@@ -44,9 +44,9 @@ describe('options', () => {
 
     afterAll((done) => {
       if (server) {
-        server.close(() => {
-          done();
-        });
+        server.close(done);
+      } else {
+        done();
       }
     });
 

test/server/https-option.test.js

@@ -42,9 +42,7 @@ describe('https option', () => {
       req.get('/').expect(200, /Heyo/, done);
     });
 
-    afterAll(() => {
-      testServer.close();
-    });
+    afterAll(testServer.close);
   });
 
   describe('as an object when ca, pfx, key and cert are buffer', () => {

test/server/utils/runBonjour.test.js

@@ -9,34 +9,29 @@ jest.mock('os', () => {
 });
 
 describe('runBonjour', () => {
-  let mock;
-  let publish = jest.fn();
-  let unpublishAll = jest.fn();
+  const mockPublish = jest.fn();
+  const mockUnpublishAll = jest.fn();
 
   beforeAll(() => {
-    mock = jest.mock('bonjour', () => () => {
+    jest.mock('bonjour', () => () => {
       return {
-        publish,
-        unpublishAll,
+        publish: mockPublish,
+        unpublishAll: mockUnpublishAll,
       };
     });
   });
 
   afterEach(() => {
-    publish = jest.fn();
-    unpublishAll = jest.fn();
-  });
-
-  afterAll(() => {
-    mock.mockRestore();
+    mockPublish.mockClear();
+    mockUnpublishAll.mockClear();
   });
 
   it('should call bonjour.publish', () => {
     runBonjour({
       port: 1111,
     });
 
-    expect(publish.mock.calls[0][0]).toMatchSnapshot();
+    expect(mockPublish.mock.calls[0][0]).toMatchSnapshot();
   });
 
   it('should call bonjour.publish with different name for different ports', () => {
@@ -47,7 +42,7 @@ describe('runBonjour', () => {
       port: 2222,
     });
 
-    const calls = publish.mock.calls;
+    const calls = mockPublish.mock.calls;
 
     expect(calls[0][0].name).not.toEqual(calls[1][0].name);
   });