fix(open): set wait: false to run server.close successfully

fixes: #1990
webpack · Jun 8, 2019 · bf696bd · bf696bd
1 parent 7fe3fbd
commit bf696bd
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 30 deletions.
diff --git a/lib/utils/runOpen.js b/lib/utils/runOpen.js
@@ -3,11 +3,14 @@
 const open = require('opn');
 
 function runOpen(uri, options, log) {
-  let openOptions = {};
+  // https://github.com/webpack/webpack-dev-server/issues/1990
+  const openOptions = { wait: false };
   let openMessage = 'Unable to open browser';
 
   if (typeof options.open === 'string') {
-    openOptions = { app: options.open };
+    Object.assign(openOptions, {
+      app: options.open,
+    });
     openMessage += `: ${options.open}`;
   }
 

diff --git a/test/server/utils/runOpen.test.js b/test/server/utils/runOpen.test.js
@@ -17,7 +17,14 @@ describe('runOpen util', () => {
 
     it('on specify URL', () => {
       return runOpen('https://example.com', {}, console).then(() => {
-        expect(opn.mock.calls[0]).toEqual(['https://example.com', {}]);
+        expect(opn.mock.calls[0]).toMatchInlineSnapshot(`
+          Array [
+            "https://example.com",
+            Object {
+              "wait": false,
+            },
+          ]
+        `);
       });
     });
 
@@ -27,10 +34,14 @@ describe('runOpen util', () => {
         { openPage: '/index.html' },
         console
       ).then(() => {
-        expect(opn.mock.calls[0]).toEqual([
-          'https://example.com/index.html',
-          {},
-        ]);
+        expect(opn.mock.calls[0]).toMatchInlineSnapshot(`
+          Array [
+            "https://example.com/index.html",
+            Object {
+              "wait": false,
+            },
+          ]
+        `);
       });
     });
 
@@ -40,10 +51,15 @@ describe('runOpen util', () => {
         { open: 'Google Chrome' },
         console
       ).then(() => {
-        expect(opn.mock.calls[0]).toEqual([
-          'https://example.com',
-          { app: 'Google Chrome' },
-        ]);
+        expect(opn.mock.calls[0]).toMatchInlineSnapshot(`
+          Array [
+            "https://example.com",
+            Object {
+              "app": "Google Chrome",
+              "wait": false,
+            },
+          ]
+        `);
       });
     });
 
@@ -53,10 +69,15 @@ describe('runOpen util', () => {
         { open: 'Google Chrome', openPage: '/index.html' },
         console
       ).then(() => {
-        expect(opn.mock.calls[0]).toEqual([
-          'https://example.com/index.html',
-          { app: 'Google Chrome' },
-        ]);
+        expect(opn.mock.calls[0]).toMatchInlineSnapshot(`
+          Array [
+            "https://example.com/index.html",
+            Object {
+              "app": "Google Chrome",
+              "wait": false,
+            },
+          ]
+        `);
       });
     });
   });
@@ -77,7 +98,14 @@ describe('runOpen util', () => {
         expect(logMock.warn.mock.calls[0][0]).toMatchInlineSnapshot(
           `"Unable to open browser. If you are running in a headless environment, please do not use the --open flag"`
         );
-        expect(opn.mock.calls[0]).toEqual(['https://example.com', {}]);
+        expect(opn.mock.calls[0]).toMatchInlineSnapshot(`
+          Array [
+            "https://example.com",
+            Object {
+              "wait": false,
+            },
+          ]
+        `);
       });
     });
 
@@ -90,10 +118,14 @@ describe('runOpen util', () => {
         expect(logMock.warn.mock.calls[0][0]).toMatchInlineSnapshot(
           `"Unable to open browser. If you are running in a headless environment, please do not use the --open flag"`
         );
-        expect(opn.mock.calls[0]).toEqual([
-          'https://example.com/index.html',
-          {},
-        ]);
+        expect(opn.mock.calls[0]).toMatchInlineSnapshot(`
+          Array [
+            "https://example.com/index.html",
+            Object {
+              "wait": false,
+            },
+          ]
+        `);
       });
     });
 
@@ -106,12 +138,15 @@ describe('runOpen util', () => {
         expect(logMock.warn.mock.calls[0][0]).toMatchInlineSnapshot(
           `"Unable to open browser: Google Chrome. If you are running in a headless environment, please do not use the --open flag"`
         );
-        expect(opn.mock.calls[0]).toEqual([
-          'https://example.com',
-          {
-            app: 'Google Chrome',
-          },
-        ]);
+        expect(opn.mock.calls[0]).toMatchInlineSnapshot(`
+          Array [
+            "https://example.com",
+            Object {
+              "app": "Google Chrome",
+              "wait": false,
+            },
+          ]
+        `);
       });
     });
 
@@ -124,10 +159,15 @@ describe('runOpen util', () => {
         expect(logMock.warn.mock.calls[0][0]).toMatchInlineSnapshot(
           `"Unable to open browser: Google Chrome. If you are running in a headless environment, please do not use the --open flag"`
         );
-        expect(opn.mock.calls[0]).toEqual([
-          'https://example.com/index.html',
-          { app: 'Google Chrome' },
-        ]);
+        expect(opn.mock.calls[0]).toMatchInlineSnapshot(`
+          Array [
+            "https://example.com/index.html",
+            Object {
+              "app": "Google Chrome",
+              "wait": false,
+            },
+          ]
+        `);
       });
     });
   });