Merge branch 'alexturpin'

BrowserSync · Nov 20, 2016 · 3aced70 · 3aced70
2 parents 42bab46 + 8dd9f01
commit 3aced70
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/lib/internal-events.js b/lib/internal-events.js
@@ -42,7 +42,7 @@ module.exports = function (bs) {
             var open = bs.options.get("open");
 
             if (mode === "proxy" || mode === "server" || open === "ui" || open === "ui-external") {
-                utils.openBrowser(data.url, bs.options);
+                utils.openBrowser(data.url, bs.options, bs);
             }
 
             // log about any file watching

diff --git a/lib/logger.js b/lib/logger.js
@@ -67,6 +67,12 @@ module.exports.callbacks = {
             logger.info("{cyan:Reloading Browsers...");
         }
     },
+    /**
+     *
+     */
+    "browser:error": function () {
+        logger.error("Couldn't open browser (if you are using BrowserSync in a headless environment, you might want to set the {cyan:open} option to {cyan:false})");
+    },
     /**
      * @param {BrowserSync} bs
      * @param data

diff --git a/lib/utils.js b/lib/utils.js
@@ -139,8 +139,9 @@ var utils = {
      * Open the page in browser
      * @param {String} url
      * @param {Object} options
+     * @param {BrowserSync} bs
      */
-    openBrowser: function (url, options) {
+    openBrowser: function (url, options, bs) {
 
         var open    = options.get("open");
         var browser = options.get("browser");
@@ -155,22 +156,23 @@ var utils = {
             if (browser !== "default") {
                 if (utils.isList(browser)) {
                     browser.forEach(function (browser) {
-                        utils.open(url, browser);
+                        utils.open(url, browser, bs);
                     });
                 } else {
-                    utils.open(url, browser); // single
+                    utils.open(url, browser, bs); // single
                 }
             } else {
-                utils.open(url);
+                utils.open(url, null, bs);
             }
         }
     },
     /**
-     * Wrapper for open module - for easier stubbin'
+     * Wrapper for opn module
      * @param url
      * @param name
+     * @param bs
      */
-    open: function (url, name) {
+    open: function (url, name, bs) {
         var options = (function () {
             if (_.isString(name)) {
                 return {app: name};
@@ -180,7 +182,10 @@ var utils = {
             }
             return {};
         })();
-        require("opn")(url, options);
+        var opn = require("opn");
+        opn(url, options).catch(function() {
+            bs.events.emit("browser:error");
+        });
     },
     /**
      * @param {Boolean} kill

diff --git a/test/specs/e2e/e2e.options.open.browsers.js b/test/specs/e2e/e2e.options.open.browsers.js
@@ -94,7 +94,8 @@ describe("E2E browser option with app args", function () {
         var stub = sinon.spy(utils, "open");
         var opnPath = require.resolve("opn");
         require(opnPath);
-        var opnStub = require("sinon").stub(require.cache[opnPath], "exports");
+        var opnStub = require("sinon").stub(require.cache[opnPath], "exports")
+            .returns({catch: function(){}});
 
         browserSync(config, function (err, bs) {
             bs.cleanup();
@@ -126,7 +127,8 @@ describe("E2E browser option with app args", function () {
         var stub = sinon.spy(utils, "open");
         var opnPath = require.resolve("opn");
         require(opnPath);
-        var opnStub = require("sinon").stub(require.cache[opnPath], "exports");
+        var opnStub = require("sinon").stub(require.cache[opnPath], "exports")
+            .returns({catch: function(){}});
 
         browserSync(config, function (err, bs) {
             bs.cleanup();

diff --git a/test/specs/e2e/e2e.options.open.js b/test/specs/e2e/e2e.options.open.js
@@ -50,7 +50,8 @@ describe("E2E OPEN options with external", function () {
         stub = sinon.spy(utils, "open");
         opnPath = require.resolve("opn");
         require(opnPath);
-        opnStub = require("sinon").stub(require.cache[opnPath], "exports");
+        opnStub = require("sinon").stub(require.cache[opnPath], "exports")
+            .returns({catch: function(){}});
         bs = browserSync(config, done).instance;
     });
 
@@ -81,7 +82,8 @@ describe("E2E OPEN options with UI + snippet", function () {
         stub = sinon.spy(utils, "open");
         opnPath = require.resolve("opn");
         require(opnPath);
-        opnStub = require("sinon").stub(require.cache[opnPath], "exports");
+        opnStub = require("sinon").stub(require.cache[opnPath], "exports")
+            .returns({catch: function(){}});
         bs = browserSync(config, done).instance;
     });