Merge pull request #986 from nightwing/master

Use https url for socket when page is loaded over https

Author: shakyShane

lib/templates/connector.tmpl

@@ -3,4 +3,8 @@ ___browserSync___.io = window.io;
 window.io = window.___browserSync___oldSocketIo;
 window.___browserSync___oldSocketIo=undefined;
 ___browserSync___.socketConfig = %config%;
-___browserSync___.socket = ___browserSync___.io(%url%, ___browserSync___.socketConfig);
+___browserSync___.url = %url%;
+if (location.protocol == "https:" && /^http:/.test(___browserSync___.url)) {
+    ___browserSync___.url = ___browserSync___.url.replace(/^http:/, "https:");
+}
+___browserSync___.socket = ___browserSync___.io(___browserSync___.url, ___browserSync___.socketConfig);

test/specs/e2e/e2e.options.scriptpath.js

@@ -53,7 +53,7 @@ describe("E2E Socket namespace test - given a string", function () {
             .get(instance.options.getIn(["scriptPaths", "path"]))
             .expect(200)
             .end(function (err, res) {
-                assert.include(res.text, "io('' + location.host + '/TEST',");
+                assert.include(res.text, "___browserSync___.url = '' + location.host + '/TEST';");
                 done();
             });
     });

test/specs/utils/utils.connect.js

@@ -92,7 +92,7 @@ describe("Connection snippetUtils", function () {
             }
         });
         var actual   = utils.socketConnector(options);
-        assert.include(actual, "___browserSync___.io('localhost:3000/browser-sync', ___browserSync___.socketConfig);");
+        assert.include(actual, "___browserSync___.url = 'localhost:3000/browser-sync';");
     });
     it("should allow setting of the socket domain + namespace", function () {
         var options = merge({
@@ -105,7 +105,7 @@ describe("Connection snippetUtils", function () {
             }
         });
         var actual   = utils.socketConnector(options);
-        assert.include(actual, "___browserSync___.io('localhost:3000/shane', ___browserSync___.socketConfig);");
+        assert.include(actual, "___browserSync___.url = 'localhost:3000/shane';");
     });
     it("should allow setting of the socket domain (fn)+ namespace", function () {
         var options = merge({
@@ -123,7 +123,7 @@ describe("Connection snippetUtils", function () {
             }
         });
         var actual   = utils.socketConnector(options);
-        assert.include(actual, "___browserSync___.io('http://localhost:3002/shane', ___browserSync___.socketConfig);");
+        assert.include(actual, "___browserSync___.url = 'http://localhost:3002/shane';");
     });
     it("should allow setting of the socket namespace with fn (back compat)", function () {
         var options = merge({
@@ -140,7 +140,7 @@ describe("Connection snippetUtils", function () {
             }
         });
         var actual   = utils.socketConnector(options);
-        assert.include(actual, "___browserSync___.io('' + location.host + '/browser-sync', ___browserSync___.socketConfig);");
+        assert.include(actual, "___browserSync___.url = '' + location.host + '/browser-sync';");
     });
     it("E2E Should allow setting of socket.domain + script.domain as strings", function (done) {
         bs.reset();