From 0783a4a6c0ce86b01453dff29c27bcf956c8b8a7 Mon Sep 17 00:00:00 2001
From: Yuta Hiroto <git@about-hiroppy.com>
Date: Tue, 4 Jun 2019 20:45:59 +0200
Subject: [PATCH] test: change jest.setTimeout from 20000 to 30000 (#1965)

---
 setupTest.js                   |  2 +-
 test/ContentBase.test.js       |  6 ------
 test/LiveReload.test.js        |  4 ----
 test/e2e/Client.test.js        |  4 ----
 test/e2e/ClientOptions.test.js | 12 ------------
 test/e2e/ProvidePlugin.test.js |  4 ----
 6 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/setupTest.js b/setupTest.js
index 1843728ba2..c6223d215a 100644
--- a/setupTest.js
+++ b/setupTest.js
@@ -1,3 +1,3 @@
 'use strict';
 
-jest.setTimeout(20000);
+jest.setTimeout(30000);
diff --git a/test/ContentBase.test.js b/test/ContentBase.test.js
index 4e07cf02a7..b908657a87 100644
--- a/test/ContentBase.test.js
+++ b/test/ContentBase.test.js
@@ -22,8 +22,6 @@ describe('ContentBase', () => {
   describe('to directory', () => {
     const nestedFile = path.join(contentBasePublic, 'assets/example.txt');
 
-    jest.setTimeout(30000);
-
     beforeAll((done) => {
       server = testServer.start(
         config,
@@ -66,8 +64,6 @@ describe('ContentBase', () => {
   });
 
   describe('test ignoring node_modules folder by Default', () => {
-    jest.setTimeout(30000);
-
     beforeAll((done) => {
       server = testServer.start(config, {
         contentBase: contentBasePublic,
@@ -103,8 +99,6 @@ describe('ContentBase', () => {
   });
 
   describe('test not ignoring node_modules folder', () => {
-    jest.setTimeout(30000);
-
     beforeAll((done) => {
       server = testServer.start(config, {
         contentBase: contentBasePublic,
diff --git a/test/LiveReload.test.js b/test/LiveReload.test.js
index 6bdddf328e..a4f66c15b2 100644
--- a/test/LiveReload.test.js
+++ b/test/LiveReload.test.js
@@ -15,8 +15,6 @@ describe('liveReload', () => {
   describe('Test disabling live reloading', () => {
     const nestedFile = path.join(contentBasePublic, 'assets/example.txt');
 
-    jest.setTimeout(30000);
-
     beforeAll((done) => {
       server = testServer.start(
         config,
@@ -64,8 +62,6 @@ describe('liveReload', () => {
   describe('Testing live reloading', () => {
     const nestedFile = path.join(contentBasePublic, 'assets/example.txt');
 
-    jest.setTimeout(30000);
-
     beforeAll((done) => {
       server = testServer.start(
         config,
diff --git a/test/e2e/Client.test.js b/test/e2e/Client.test.js
index 1ad42f963a..855d76b1e1 100644
--- a/test/e2e/Client.test.js
+++ b/test/e2e/Client.test.js
@@ -36,8 +36,6 @@ describe('reload', () => {
     });
 
     describe('on browser client', () => {
-      jest.setTimeout(30000);
-
       it('should hot reload without page refresh', (done) => {
         runBrowser().then(({ page, browser }) => {
           let refreshed = false;
@@ -116,8 +114,6 @@ describe('reload', () => {
     });
 
     describe('on browser client', () => {
-      jest.setTimeout(30000);
-
       it('should reload with page refresh', (done) => {
         runBrowser().then(({ page, browser }) => {
           let refreshed = false;
diff --git a/test/e2e/ClientOptions.test.js b/test/e2e/ClientOptions.test.js
index 4392b16175..11fb7f1ff8 100644
--- a/test/e2e/ClientOptions.test.js
+++ b/test/e2e/ClientOptions.test.js
@@ -42,8 +42,6 @@ describe('Client code', () => {
   describe('behind a proxy', () => {
     let proxy;
 
-    jest.setTimeout(30000);
-
     beforeAll(() => {
       proxy = startProxy(9000);
     });
@@ -99,8 +97,6 @@ describe('Client complex inline script path', () => {
   afterAll(testServer.close);
 
   describe('browser client', () => {
-    jest.setTimeout(30000);
-
     it('uses the correct public hostname and sockPath', (done) => {
       runBrowser().then(({ page, browser }) => {
         page
@@ -137,8 +133,6 @@ describe('Client complex inline script path with sockPort', () => {
   afterAll(testServer.close);
 
   describe('browser client', () => {
-    jest.setTimeout(30000);
-
     it('uses the correct sockPort', (done) => {
       runBrowser().then(({ page, browser }) => {
         page
@@ -177,8 +171,6 @@ describe('Client complex inline script path with sockPort, no sockPath', () => {
   afterAll(testServer.close);
 
   describe('browser client', () => {
-    jest.setTimeout(30000);
-
     it('uses the correct sockPort and sockPath', (done) => {
       runBrowser().then(({ page, browser }) => {
         page
@@ -212,8 +204,6 @@ describe('Client complex inline script path with sockHost', () => {
   afterAll(testServer.close);
 
   describe('browser client', () => {
-    jest.setTimeout(30000);
-
     it('uses the correct sockHost', (done) => {
       runBrowser().then(({ page, browser }) => {
         page
@@ -231,8 +221,6 @@ describe('Client complex inline script path with sockHost', () => {
 });
 
 describe('Client console.log', () => {
-  jest.setTimeout(30000);
-
   const baseOptions = {
     port: 9000,
     host: '0.0.0.0',
diff --git a/test/e2e/ProvidePlugin.test.js b/test/e2e/ProvidePlugin.test.js
index 81382937c9..3a42331162 100644
--- a/test/e2e/ProvidePlugin.test.js
+++ b/test/e2e/ProvidePlugin.test.js
@@ -21,8 +21,6 @@ describe('ProvidePlugin', () => {
     afterAll(testServer.close);
 
     describe('on browser client', () => {
-      jest.setTimeout(30000);
-
       it('should inject SockJS client implementation', (done) => {
         runBrowser().then(({ page, browser }) => {
           page.waitForNavigation({ waitUntil: 'load' }).then(() => {
@@ -57,8 +55,6 @@ describe('ProvidePlugin', () => {
     afterAll(testServer.close);
 
     describe('on browser client', () => {
-      jest.setTimeout(30000);
-
       it('should not inject client implementation', (done) => {
         runBrowser().then(({ page, browser }) => {
           page.waitForNavigation({ waitUntil: 'load' }).then(() => {