Merge c608cf7 into ab38035

homer0 · Jul 6, 2018 · 600967e · 600967e
2 parents ab38035 + c608cf7
commit 600967e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/services/configurations/browserDevelopmentConfiguration.js b/src/services/configurations/browserDevelopmentConfiguration.js
@@ -188,6 +188,7 @@ class WebpackBrowserDevelopmentConfiguration extends ConfigurationFile {
       // Push the plugin that logs the dev server statuses and opens the browser.
       config.plugins.push(new ProjextWebpackOpenDevServer(devServerConfig.url, {
         logger: this.appLogger,
+        openBrowser: devServerConfig.open,
       }));
     } else if (target.hot) {
       /**

diff --git a/tests/services/configurations/browserDevelopmentConfiguration.test.js b/tests/services/configurations/browserDevelopmentConfiguration.test.js
@@ -411,6 +411,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
       runOnDevelopment: true,
       devServer: {
         port: 2509,
+        open: true,
         host: 'localhost',
         ssl: {},
         proxied: {},
@@ -526,6 +527,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledTimes(1);
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledWith(expectedURL, {
       logger: appLogger,
+      openBrowser: target.devServer.open,
     });
   });
 
@@ -549,6 +551,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
       devServer: {
         port: 2509,
         host: 'localhost',
+        open: false,
         ssl: {},
         proxied: {},
         historyApiFallback: true,
@@ -665,6 +668,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledTimes(1);
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledWith(expectedURL, {
       logger: appLogger,
+      openBrowser: target.devServer.open,
     });
   });
 
@@ -690,6 +694,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
       devServer: {
         port: 2509,
         host: 'localhost',
+        open: false,
         ssl: {
           key: null,
           cert: 'some/file.crt',
@@ -803,6 +808,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledTimes(1);
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledWith(expectedURL, {
       logger: appLogger,
+      openBrowser: target.devServer.open,
     });
   });
 
@@ -828,6 +834,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
       devServer: {
         port: 2509,
         host: 'my-host',
+        open: true,
         ssl: {
           key: null,
           cert: 'some/file.crt',
@@ -949,6 +956,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledTimes(1);
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledWith(expectedURL, {
       logger: appLogger,
+      openBrowser: target.devServer.open,
     });
   });
 
@@ -974,6 +982,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
       devServer: {
         port: 2509,
         host: 'localhost',
+        open: false,
         ssl: {},
         proxied: {
           enabled: true,
@@ -1093,6 +1102,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledTimes(1);
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledWith(expectedURL, {
       logger: appLogger,
+      openBrowser: target.devServer.open,
     });
   });
 
@@ -1118,6 +1128,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
       devServer: {
         port: 2509,
         host: 'localhost',
+        open: true,
         ssl: {},
         proxied: {
           enabled: true,
@@ -1237,6 +1248,7 @@ describe('services/configurations:browserDevelopmentConfiguration', () => {
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledTimes(1);
     expect(ProjextWebpackOpenDevServer).toHaveBeenCalledWith(expectedURL, {
       logger: appLogger,
+      openBrowser: target.devServer.open,
     });
   });