test: refactor (#1768)

Author: evilebottnawi

test/Headers.test.js

@@ -0,0 +1,60 @@
+'use strict';
+
+const request = require('supertest');
+const helper = require('./helper');
+const config = require('./fixtures/simple-config/webpack.config');
+
+describe('Headers', () => {
+  let server;
+  let req;
+
+  describe('as a string', () => {
+    beforeAll((done) => {
+      server = helper.start(
+        config,
+        {
+          headers: { 'X-Foo': '1' },
+        },
+        done
+      );
+      req = request(server.app);
+    });
+
+    afterAll(helper.close);
+
+    it('GET request with headers', (done) => {
+      req
+        .get('/main')
+        .expect('X-Foo', '1')
+        .expect(200, done);
+    });
+  });
+
+  describe('as an array', () => {
+    beforeAll((done) => {
+      server = helper.start(
+        config,
+        {
+          headers: { 'X-Bar': ['key1=value1', 'key2=value2'] },
+        },
+        done
+      );
+      req = request(server.app);
+    });
+
+    afterAll(helper.close);
+
+    it('GET request with headers as an array', (done) => {
+      // https://github.com/webpack/webpack-dev-server/pull/1650#discussion_r254217027
+      const expected = ['v7', 'v8', 'v9'].includes(
+        process.version.split('.')[0]
+      )
+        ? 'key1=value1,key2=value2'
+        : 'key1=value1, key2=value2';
+      req
+        .get('/main')
+        .expect('X-Bar', expected)
+        .expect(200, done);
+    });
+  });
+});

test/Routes.test.js

@@ -19,101 +19,49 @@ describe('Routes', () => {
   let server;
   let req;
 
-  describe('without headers', () => {
-    beforeAll((done) => {
-      server = helper.startAwaitingCompilation(config, {}, done);
-      req = request(server.app);
-    });
-
-    afterAll(helper.close);
-
-    it('GET request to inline bundle', (done) => {
-      req
-        .get('/webpack-dev-server.js')
-        .expect('Content-Type', 'application/javascript')
-        .expect(200, done);
-    });
-
-    it('GET request to live bundle', (done) => {
-      req
-        .get('/__webpack_dev_server__/live.bundle.js')
-        .expect('Content-Type', 'application/javascript')
-        .expect(200, done);
-    });
-
-    it('GET request to sockjs bundle', (done) => {
-      req
-        .get('/__webpack_dev_server__/sockjs.bundle.js')
-        .expect('Content-Type', 'application/javascript')
-        .expect(200, done);
-    });
-
-    it('GET request to live html', (done) => {
-      req
-        .get('/webpack-dev-server/')
-        .expect('Content-Type', 'text/html')
-        .expect(200, /__webpack_dev_server__/, done);
-    });
+  beforeAll((done) => {
+    server = helper.startAwaitingCompilation(config, {}, done);
+    req = request(server.app);
+  });
 
-    it('GET request to directory index', (done) => {
-      req
-        .get('/webpack-dev-server')
-        .expect('Content-Type', 'text/html')
-        .expect(200, directoryIndex.trim(), done);
-    });
+  afterAll(helper.close);
 
-    it('GET request to magic html', (done) => {
-      req.get('/main').expect(200, magicHtml.trim(), done);
-    });
+  it('GET request to inline bundle', (done) => {
+    req
+      .get('/webpack-dev-server.js')
+      .expect('Content-Type', 'application/javascript')
+      .expect(200, done);
   });
 
-  describe('headers as a string', () => {
-    beforeAll((done) => {
-      server = helper.start(
-        config,
-        {
-          headers: { 'X-Foo': '1' },
-        },
-        done
-      );
-      req = request(server.app);
-    });
-
-    afterAll(helper.close);
+  it('GET request to live bundle', (done) => {
+    req
+      .get('/__webpack_dev_server__/live.bundle.js')
+      .expect('Content-Type', 'application/javascript')
+      .expect(200, done);
+  });
 
-    it('GET request with headers', (done) => {
-      req
-        .get('/main')
-        .expect('X-Foo', '1')
-        .expect(200, done);
-    });
+  it('GET request to sockjs bundle', (done) => {
+    req
+      .get('/__webpack_dev_server__/sockjs.bundle.js')
+      .expect('Content-Type', 'application/javascript')
+      .expect(200, done);
   });
 
-  describe('headers as an array', () => {
-    beforeAll((done) => {
-      server = helper.start(
-        config,
-        {
-          headers: { 'X-Bar': ['key1=value1', 'key2=value2'] },
-        },
-        done
-      );
-      req = request(server.app);
-    });
+  it('GET request to live html', (done) => {
+    req
+      .get('/webpack-dev-server/')
+      .expect('Content-Type', 'text/html')
+      .expect(200, /__webpack_dev_server__/, done);
+  });
 
-    afterAll(helper.close);
+  it('GET request to directory index', (done) => {
+    req
+      .get('/webpack-dev-server')
+      .expect('Content-Type', 'text/html')
+      .expect(200, directoryIndex.trim(), done);
+  });
 
-    it('GET request with headers as an array', (done) => {
-      // https://github.com/webpack/webpack-dev-server/pull/1650#discussion_r254217027
-      const expected = ['v7', 'v8', 'v9'].includes(
-        process.version.split('.')[0]
-      )
-        ? 'key1=value1,key2=value2'
-        : 'key1=value1, key2=value2';
-      req
-        .get('/main')
-        .expect('X-Bar', expected)
-        .expect(200, done);
-    });
+  it('GET request to magic html', (done) => {
+    req.get('/main').expect(200, magicHtml.trim(), done);
   });
 });

test/Util.test.js

@@ -120,22 +120,26 @@ describe('check utility functions', () => {
 
 describe('findPort cli utility function', () => {
   let mockServer = null;
+
   beforeEach(() => {
     mockServer = {
       listeningApp: new EventEmitter(),
     };
   });
+
   afterEach(() => {
     mockServer.listeningApp.removeAllListeners('error');
     mockServer = null;
   });
+
   it('should find empty port starting from defaultPort', (done) => {
     findPort(mockServer, 8180, 3, (err, port) => {
       assert(err == null);
       assert(port === 8180);
       done();
     });
   });
+
   it('should retry finding port for up to defaultPortRetry times', (done) => {
     let count = 0;
     const defaultPortRetry = 5;