Reset simple proxy and try keep-alive to fix appveyor env issue

Author: rlamana

test/Client.test.js

@@ -1,14 +1,31 @@
 'use strict';
 
+const express = require('express');
+const httpProxy = require('http-proxy-middleware');
 const request = require('supertest');
 const addEntries = require('../lib/utils/addEntries');
 const helper = require('./helper');
 const config = require('./fixtures/client-config/webpack.config');
 const runBrowser = require('./helpers/run-browser');
 
-describe('Client code', () => {
-  let server;
+function startProxy(port) {
+  const proxy = express();
+  proxy.use(
+    '/',
+    httpProxy({
+      target: 'http://0.0.0.0:8080',
+      ws: true,
+      changeOrigin: true,
+      proxyTimeout: 30000,
+      headers: {
+        Connection: 'keep-alive',
+      },
+    })
+  );
+  return proxy.listen(port);
+}
 
+describe('Client code', () => {
   beforeAll((done) => {
     const options = {
       compress: true,
@@ -21,35 +38,22 @@ describe('Client code', () => {
       },
     };
     addEntries(config, options);
-    server = helper.start(config, options, done);
+    helper.start(config, options, done);
   });
 
-  afterAll((done) => {
-    server.close(done);
-  });
+  afterAll(helper.close);
 
   describe('behind a proxy', () => {
     let proxy;
 
     jest.setTimeout(30000);
 
-    beforeAll((done) => {
-      // Start dev server as proxy.
-      proxy = helper.start(
-        config,
-        {
-          port: 9000,
-          host: 'localhost',
-          proxy: {
-            '/': 'http://0.0.0.0:8080',
-          },
-        },
-        done
-      );
+    beforeAll(() => {
+      proxy = startProxy(9000);
     });
 
-    afterAll((done) => {
-      proxy.close(done);
+    afterAll(() => {
+      proxy.close();
     });
 
     it('responds with a 200', (done) => {