From 0d0187e36e2418fc88af74cffb41e145f25c91be Mon Sep 17 00:00:00 2001
From: Yuta Hiroto <git@about-hiroppy.com>
Date: Mon, 10 Jun 2019 17:44:06 +0200
Subject: [PATCH] chore: fix code from master

---
 globalSetupTest.js                     | 3 +--
 test/ports-map.js                      | 4 +---
 test/server/contentBase-option.test.js | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/globalSetupTest.js b/globalSetupTest.js
index c82cbb1432..1e4123b5fa 100644
--- a/globalSetupTest.js
+++ b/globalSetupTest.js
@@ -7,8 +7,7 @@ const ports = require('./test/ports-map');
 async function validatePorts() {
   const samples = [];
 
-  Object.keys(ports).forEach((key) => {
-    const value = ports[key];
+  Object.entries(ports).forEach(([key, value]) => {
     const arr = Array.isArray(value) ? value : [value];
 
     arr.forEach((port) => {
diff --git a/test/ports-map.js b/test/ports-map.js
index ac73aaa142..81133db921 100644
--- a/test/ports-map.js
+++ b/test/ports-map.js
@@ -48,9 +48,7 @@ const portsList = {
 let startPort = 8089;
 const ports = {};
 
-Object.keys(portsList).forEach((key) => {
-  const value = portsList[key];
-
+Object.entries(portsList).forEach(([key, value]) => {
   ports[key] =
     value === 1
       ? (startPort += 1)
diff --git a/test/server/contentBase-option.test.js b/test/server/contentBase-option.test.js
index b6a679ad6f..acaa46da02 100644
--- a/test/server/contentBase-option.test.js
+++ b/test/server/contentBase-option.test.js
@@ -345,7 +345,7 @@ describe('contentBase option', () => {
     beforeAll((done) => {
       jest.spyOn(process, 'cwd').mockImplementation(() => contentBasePublic);
 
-      server = testServer.start(config, {}, done);
+      server = testServer.start(config, { port }, done);
       req = request(server.app);
     });