Skip to content

Commit 6e60f44

Browse files
committed
test: refactor
1 parent 8ebbade commit 6e60f44

File tree

4 files changed

+338
-144
lines changed

4 files changed

+338
-144
lines changed

bin/cli-flags.js

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -359,46 +359,6 @@ module.exports = {
359359
simpleType: 'boolean',
360360
multiple: false,
361361
},
362-
firewall: {
363-
configs: [
364-
{
365-
type: 'boolean',
366-
multiple: false,
367-
description:
368-
'Defines routes which are enabled by default, on by default and allows localhost.',
369-
path: 'firewall',
370-
},
371-
{
372-
type: 'string',
373-
multiple: true,
374-
description:
375-
'Defines routes which are enabled by default, on by default and allows localhost.',
376-
path: 'firewall[]',
377-
},
378-
],
379-
description:
380-
'Defines routes which are enabled by default, on by default and allows localhost.',
381-
negatedDescription: 'Disable firewall.',
382-
simpleType: 'string',
383-
multiple: true,
384-
},
385-
'firewall-reset': {
386-
configs: [
387-
{
388-
type: 'reset',
389-
multiple: false,
390-
description: 'Clear all items provided in firewall configuration.',
391-
path: 'firewall',
392-
},
393-
],
394-
description: 'Clear all items provided in firewall configuration.',
395-
simpleType: 'boolean',
396-
multiple: false,
397-
processor(opts) {
398-
opts.firewall = opts.firewall || [];
399-
delete opts.firewallReset;
400-
},
401-
},
402362
'history-api-fallback': {
403363
configs: [
404364
{

test/cli/__snapshots__/cli.test.js.snap.webpack4

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

3-
exports[`CLI --bonjour 1`] = `
3+
exports[`CLI bonjour option --bonjour 1`] = `
44
"<i> [webpack-dev-server] Project is running at:
55
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
66
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
@@ -9,7 +9,7 @@ exports[`CLI --bonjour 1`] = `
99
<i> [webpack-dev-server] Broadcasting \\"http\\" with subtype of \\"webpack\\" via ZeroConf DNS (Bonjour)"
1010
`;
1111

12-
exports[`CLI --bonjour and --https 1`] = `
12+
exports[`CLI bonjour option --bonjour and --https 1`] = `
1313
"<i> [webpack-dev-server] Project is running at:
1414
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
1515
<i> [webpack-dev-server] On Your Network (IPv4): https://<network-ip-v4>:<port>/
@@ -18,7 +18,7 @@ exports[`CLI --bonjour and --https 1`] = `
1818
<i> [webpack-dev-server] Broadcasting \\"https\\" with subtype of \\"webpack\\" via ZeroConf DNS (Bonjour)"
1919
`;
2020

21-
exports[`CLI --no-bonjour 1`] = `
21+
exports[`CLI bonjour option --no-bonjour 1`] = `
2222
"<i> [webpack-dev-server] Project is running at:
2323
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
2424
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
@@ -286,3 +286,139 @@ Webpack documentation: https://webpack.js.org/.
286286
CLI documentation: https://webpack.js.org/api/cli/.
287287
Made with ♥ by the webpack team."
288288
`;
289+
290+
exports[`CLI static option --no-static-serve-index: stderr 1`] = `
291+
"<i> [webpack-dev-server] Project is running at:
292+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
293+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
294+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
295+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
296+
`;
297+
298+
exports[`CLI static option --no-static-watch: stderr 1`] = `
299+
"<i> [webpack-dev-server] Project is running at:
300+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
301+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
302+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
303+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
304+
`;
305+
306+
exports[`CLI static option --static <value>: stderr 1`] = `
307+
"<i> [webpack-dev-server] Project is running at:
308+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
309+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
310+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
311+
<i> [webpack-dev-server] Content not from webpack is served from 'new-static' directory"
312+
`;
313+
314+
exports[`CLI static option --static --static-directory: stderr 1`] = `
315+
"<i> [webpack-dev-server] Project is running at:
316+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
317+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
318+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
319+
<i> [webpack-dev-server] Content not from webpack is served from 'static-dir' directory"
320+
`;
321+
322+
exports[`CLI static option --static: stderr 1`] = `
323+
"<i> [webpack-dev-server] Project is running at:
324+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
325+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
326+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
327+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
328+
`;
329+
330+
exports[`CLI static option --static-directory: stderr 1`] = `
331+
"<i> [webpack-dev-server] Project is running at:
332+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
333+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
334+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
335+
<i> [webpack-dev-server] Content not from webpack is served from 'static-dir' directory"
336+
`;
337+
338+
exports[`CLI static option --static-public-path: stderr 1`] = `
339+
"<i> [webpack-dev-server] Project is running at:
340+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
341+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
342+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
343+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
344+
`;
345+
346+
exports[`CLI static option --static-public-path-reset: stderr 1`] = `
347+
"<i> [webpack-dev-server] Project is running at:
348+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
349+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
350+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
351+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
352+
`;
353+
354+
exports[`CLI static option --static-reset --static-directory <value>: stderr 1`] = `
355+
"<i> [webpack-dev-server] Project is running at:
356+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
357+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
358+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
359+
<i> [webpack-dev-server] Content not from webpack is served from 'new-static-directory' directory"
360+
`;
361+
362+
exports[`CLI static option --static-reset: stderr 1`] = `
363+
"<i> [webpack-dev-server] Project is running at:
364+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
365+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
366+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
367+
<i> [webpack-dev-server] Content not from webpack is served from 'new-static-after-reset' directory"
368+
`;
369+
370+
exports[`CLI static option --static-serve-index: stderr 1`] = `
371+
"<i> [webpack-dev-server] Project is running at:
372+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
373+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
374+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
375+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
376+
`;
377+
378+
exports[`CLI static option --static-watch: stderr 1`] = `
379+
"<i> [webpack-dev-server] Project is running at:
380+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
381+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
382+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
383+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
384+
`;
385+
386+
exports[`CLI watchFiles option --watch-files: stderr 1`] = `
387+
"<i> [webpack-dev-server] Project is running at:
388+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
389+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
390+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
391+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
392+
`;
393+
394+
exports[`CLI watchFiles option --watch-files-paths: stderr 1`] = `
395+
"<i> [webpack-dev-server] Project is running at:
396+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
397+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
398+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
399+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
400+
`;
401+
402+
exports[`CLI watchFiles option --watch-files-paths-reset: stderr 1`] = `
403+
"<i> [webpack-dev-server] Project is running at:
404+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
405+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
406+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
407+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
408+
`;
409+
410+
exports[`CLI watchFiles option --watch-files-reset --watch-files-paths <value>: stderr 1`] = `
411+
"<i> [webpack-dev-server] Project is running at:
412+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
413+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
414+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
415+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
416+
`;
417+
418+
exports[`CLI watchFiles option --watch-files-reset: stderr 1`] = `
419+
"<i> [webpack-dev-server] Project is running at:
420+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
421+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
422+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
423+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
424+
`;

test/cli/__snapshots__/cli.test.js.snap.webpack5

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

3-
exports[`CLI --bonjour 1`] = `
3+
exports[`CLI bonjour option --bonjour 1`] = `
44
"<i> [webpack-dev-server] Project is running at:
55
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
66
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
@@ -9,7 +9,7 @@ exports[`CLI --bonjour 1`] = `
99
<i> [webpack-dev-server] Broadcasting \\"http\\" with subtype of \\"webpack\\" via ZeroConf DNS (Bonjour)"
1010
`;
1111

12-
exports[`CLI --bonjour and --https 1`] = `
12+
exports[`CLI bonjour option --bonjour and --https 1`] = `
1313
"<i> [webpack-dev-server] Project is running at:
1414
<i> [webpack-dev-server] Loopback: https://localhost:<port>/
1515
<i> [webpack-dev-server] On Your Network (IPv4): https://<network-ip-v4>:<port>/
@@ -18,7 +18,7 @@ exports[`CLI --bonjour and --https 1`] = `
1818
<i> [webpack-dev-server] Broadcasting \\"https\\" with subtype of \\"webpack\\" via ZeroConf DNS (Bonjour)"
1919
`;
2020

21-
exports[`CLI --no-bonjour 1`] = `
21+
exports[`CLI bonjour option --no-bonjour 1`] = `
2222
"<i> [webpack-dev-server] Project is running at:
2323
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
2424
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
@@ -286,3 +286,139 @@ Webpack documentation: https://webpack.js.org/.
286286
CLI documentation: https://webpack.js.org/api/cli/.
287287
Made with ♥ by the webpack team."
288288
`;
289+
290+
exports[`CLI static option --no-static-serve-index: stderr 1`] = `
291+
"<i> [webpack-dev-server] Project is running at:
292+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
293+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
294+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
295+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
296+
`;
297+
298+
exports[`CLI static option --no-static-watch: stderr 1`] = `
299+
"<i> [webpack-dev-server] Project is running at:
300+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
301+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
302+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
303+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
304+
`;
305+
306+
exports[`CLI static option --static <value>: stderr 1`] = `
307+
"<i> [webpack-dev-server] Project is running at:
308+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
309+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
310+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
311+
<i> [webpack-dev-server] Content not from webpack is served from 'new-static' directory"
312+
`;
313+
314+
exports[`CLI static option --static --static-directory: stderr 1`] = `
315+
"<i> [webpack-dev-server] Project is running at:
316+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
317+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
318+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
319+
<i> [webpack-dev-server] Content not from webpack is served from 'static-dir' directory"
320+
`;
321+
322+
exports[`CLI static option --static: stderr 1`] = `
323+
"<i> [webpack-dev-server] Project is running at:
324+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
325+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
326+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
327+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
328+
`;
329+
330+
exports[`CLI static option --static-directory: stderr 1`] = `
331+
"<i> [webpack-dev-server] Project is running at:
332+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
333+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
334+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
335+
<i> [webpack-dev-server] Content not from webpack is served from 'static-dir' directory"
336+
`;
337+
338+
exports[`CLI static option --static-public-path: stderr 1`] = `
339+
"<i> [webpack-dev-server] Project is running at:
340+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
341+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
342+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
343+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
344+
`;
345+
346+
exports[`CLI static option --static-public-path-reset: stderr 1`] = `
347+
"<i> [webpack-dev-server] Project is running at:
348+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
349+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
350+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
351+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
352+
`;
353+
354+
exports[`CLI static option --static-reset --static-directory <value>: stderr 1`] = `
355+
"<i> [webpack-dev-server] Project is running at:
356+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
357+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
358+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
359+
<i> [webpack-dev-server] Content not from webpack is served from 'new-static-directory' directory"
360+
`;
361+
362+
exports[`CLI static option --static-reset: stderr 1`] = `
363+
"<i> [webpack-dev-server] Project is running at:
364+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
365+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
366+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
367+
<i> [webpack-dev-server] Content not from webpack is served from 'new-static-after-reset' directory"
368+
`;
369+
370+
exports[`CLI static option --static-serve-index: stderr 1`] = `
371+
"<i> [webpack-dev-server] Project is running at:
372+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
373+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
374+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
375+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
376+
`;
377+
378+
exports[`CLI static option --static-watch: stderr 1`] = `
379+
"<i> [webpack-dev-server] Project is running at:
380+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
381+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
382+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
383+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
384+
`;
385+
386+
exports[`CLI watchFiles option --watch-files: stderr 1`] = `
387+
"<i> [webpack-dev-server] Project is running at:
388+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
389+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
390+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
391+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
392+
`;
393+
394+
exports[`CLI watchFiles option --watch-files-paths: stderr 1`] = `
395+
"<i> [webpack-dev-server] Project is running at:
396+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
397+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
398+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
399+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
400+
`;
401+
402+
exports[`CLI watchFiles option --watch-files-paths-reset: stderr 1`] = `
403+
"<i> [webpack-dev-server] Project is running at:
404+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
405+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
406+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
407+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
408+
`;
409+
410+
exports[`CLI watchFiles option --watch-files-reset --watch-files-paths <value>: stderr 1`] = `
411+
"<i> [webpack-dev-server] Project is running at:
412+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
413+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
414+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
415+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
416+
`;
417+
418+
exports[`CLI watchFiles option --watch-files-reset: stderr 1`] = `
419+
"<i> [webpack-dev-server] Project is running at:
420+
<i> [webpack-dev-server] Loopback: http://localhost:<port>/
421+
<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
422+
<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
423+
<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/public' directory"
424+
`;

0 commit comments

Comments
 (0)