Skip to content

Commit 18bf369

Browse files
alexander-akaitalexander-akait
authored
test: fix stability (#3676)
1 parent cdcabb2 commit 18bf369

8 files changed

+30
-27
lines changed

‎test/cli/__snapshots__/bonjour-option.test.js.snap.webpack4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`"bonjour" CLI option should work using "--bonjour and --https" 1`] = `
4-
"<i> [webpack-dev-server] Generating SSL Certificate...
5-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
4+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
65
<i> [webpack-dev-server] Project is running at:
76
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
87
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/

‎test/cli/__snapshots__/bonjour-option.test.js.snap.webpack5

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`"bonjour" CLI option should work using "--bonjour and --https" 1`] = `
4-
"<i> [webpack-dev-server] Generating SSL Certificate...
5-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
4+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
65
<i> [webpack-dev-server] Project is running at:
76
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
87
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/

‎test/cli/__snapshots__/http2-option.test.js.snap.webpack4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`"http2" CLI option should work using "--http2" 1`] = `
4-
"<i> [webpack-dev-server] Generating SSL Certificate...
5-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
4+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
65
<i> [webpack-dev-server] Project is running at:
76
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
87
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/

‎test/cli/__snapshots__/http2-option.test.js.snap.webpack5

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`"http2" CLI option should work using "--http2" 1`] = `
4-
"<i> [webpack-dev-server] Generating SSL Certificate...
5-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
4+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
65
<i> [webpack-dev-server] Project is running at:
76
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
87
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/

‎test/cli/__snapshots__/https-option.test.js.snap.webpack4

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`"https" CLI option should work using "--https" 1`] = `
4-
"<i> [webpack-dev-server] Generating SSL Certificate...
5-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
4+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
65
<i> [webpack-dev-server] Project is running at:
76
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
87
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
@@ -27,8 +26,7 @@ exports[`"https" CLI option should work using "--https-key <path> --https-pfx <p
2726
`;
2827

2928
exports[`"https" CLI option should work using "--https-request-cert" 1`] = `
30-
"<i> [webpack-dev-server] Generating SSL Certificate...
31-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
29+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
3230
<i> [webpack-dev-server] Project is running at:
3331
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
3432
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
@@ -45,8 +43,7 @@ exports[`"https" CLI option should work using "--no-https" 1`] = `
4543
`;
4644

4745
exports[`"https" CLI option should work using "--no-https-request-cert" 1`] = `
48-
"<i> [webpack-dev-server] Generating SSL Certificate...
49-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
46+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
5047
<i> [webpack-dev-server] Project is running at:
5148
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
5249
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/

‎test/cli/__snapshots__/https-option.test.js.snap.webpack5

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`"https" CLI option should work using "--https" 1`] = `
4-
"<i> [webpack-dev-server] Generating SSL Certificate...
5-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
4+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
65
<i> [webpack-dev-server] Project is running at:
76
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
87
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
@@ -27,8 +26,7 @@ exports[`"https" CLI option should work using "--https-key <path> --https-pfx <p
2726
`;
2827

2928
exports[`"https" CLI option should work using "--https-request-cert" 1`] = `
30-
"<i> [webpack-dev-server] Generating SSL Certificate...
31-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
29+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
3230
<i> [webpack-dev-server] Project is running at:
3331
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
3432
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
@@ -45,8 +43,7 @@ exports[`"https" CLI option should work using "--no-https" 1`] = `
4543
`;
4644

4745
exports[`"https" CLI option should work using "--no-https-request-cert" 1`] = `
48-
"<i> [webpack-dev-server] Generating SSL Certificate...
49-
<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
46+
"<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
5047
<i> [webpack-dev-server] Project is running at:
5148
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
5249
<i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/

‎test/helpers/test-bin.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ const normalizeStderr = (stderr, options = {}) => {
9090
if (options.https) {
9191
// We have deprecation warning on windows in some cases
9292
normalizedStderr = normalizedStderr.split("\n");
93+
normalizedStderr = normalizedStderr.filter(
94+
(item) => !/Generating SSL Certificate/g.test(item)
95+
);
9396
normalizedStderr = normalizedStderr.filter(
9497
(item) =>
9598
!/DeprecationWarning: The legacy HTTP parser is deprecated/g.test(item)

‎test/server/setupExitSignals-option.test.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const port = require("../ports-map")["setup-exit-signals-option"];
77

88
describe("setupExitSignals option", () => {
99
let server;
10+
let doExit;
1011
let exitSpy;
1112
let stopCallbackSpy;
1213
let stdinResumeSpy;
@@ -26,7 +27,11 @@ describe("setupExitSignals option", () => {
2627

2728
await server.start();
2829

29-
exitSpy = jest.spyOn(process, "exit").mockImplementation(() => {});
30+
doExit = false;
31+
32+
exitSpy = jest.spyOn(process, "exit").mockImplementation(() => {
33+
doExit = true;
34+
});
3035
stdinResumeSpy = jest
3136
.spyOn(process.stdin, "resume")
3237
.mockImplementation(() => {});
@@ -44,14 +49,19 @@ describe("setupExitSignals option", () => {
4449
await server.stop();
4550
});
4651

47-
it.each(signals)("should close and exit on %s", (signal, done) => {
52+
it.each(signals)("should close and exit on %s", async (signal) => {
4853
process.emit(signal);
4954

50-
setTimeout(() => {
51-
expect(stopCallbackSpy.mock.calls.length).toEqual(1);
52-
expect(exitSpy.mock.calls.length).toEqual(1);
55+
await new Promise((resolve) => {
56+
const interval = setInterval(() => {
57+
if (doExit) {
58+
expect(stopCallbackSpy.mock.calls.length).toEqual(1);
5359

54-
done();
55-
}, 1000);
60+
clearInterval(interval);
61+
62+
resolve();
63+
}
64+
}, 100);
65+
});
5666
});
5767
});

0 commit comments

Comments
 (0)