ts: fix tests to work with new directory structure

Author: shakyShane

lib/cli/cli-info.js

@@ -31,7 +31,7 @@ var info = {
      */
     makeConfig: function (cwd, cb) {
 
-        // var opts = require(path.join(__dirname, "..", config.configFile));
+        var opts = require(path.join(__dirname, "..", config.configFile));
         var userOpts = {};
 
         var ignore = ["excludedFileTypes", "injectFileTypes", "snippetOptions"];

lib/config.js

@@ -17,7 +17,7 @@ module.exports = {
     socketIoScript: "/public/socket.io.min.1.6.0.js",
     configFile: "default-config.js",
     userFile: "bs-config.js",
-    template: "cli-template.js",
+    template: path.join(__dirname, "..", "templates/cli-template.js"),
     httpProtocol: {
         path: "/__browser_sync__"
     },

lib/index.js

@@ -247,7 +247,7 @@ function initSingleton() {
         }
     }
     var args = Array.prototype.slice.call(arguments);
-    singleton = exports.create("singleton", getSingletonEmitter());
+    singleton = create("singleton", getSingletonEmitter());
 
     if (singletonPlugins.length) {
         singletonPlugins.forEach(function (obj) {

package.json

@@ -8,24 +8,21 @@
   },
   "repository": "BrowserSync/browser-sync",
   "license": "Apache-2.0",
-  "main": "dist/lib/index.js",
+  "main": "dist/index.js",
   "bin": "dist/bin.js",
   "files": [
-    "bin",
-    "index.js",
     "dist",
     "certs",
     "templates",
     "cli-options",
-    "client/index",
     "client/dist"
   ],
   "engines": {
     "node": ">= 0.8.0"
   },
   "scripts": {
     "env": "node ./test/env.js",
-    "test": "npm run lint && npm run env && npm run unit",
+    "test": "npm run env && npm run unit",
     "lint": "eslint index.js lib bin examples test/specs gulpfile.js --fix",
     "pro": "protractor test/protractor/config.single.js",
     "pro-local": "node test/protractor/setup.js",
@@ -90,6 +87,7 @@
     "request": "2.79.0",
     "rimraf": "2.5.4",
     "sinon": "1.17.5",
+    "source-map-support": "^0.5.0",
     "supertest": "2.0.0",
     "typescript": "^2.6.2",
     "vinyl": "1.2.0"

test/specs/api/init.exit.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var browserSync = require("../../../index");
+var browserSync = require("../../../");
 
 var assert      = require("chai").assert;
 var sinon       = require("sinon");

test/specs/cli/cli.exec.js

@@ -3,7 +3,7 @@
 describe("CLI: exec", function () {
     this.timeout(10000);
     it("Can launch from cli", function (done) {
-        var strem = require("child_process").spawn("node", [require.resolve("../../../bin/browser-sync"), "start"]);
+        var strem = require("child_process").spawn("node", [require.resolve("../../../dist/bin"), "start"]);
         var chunks = [];
         strem.stdout.on("data", function (data) {
             chunks.push(data.toString());

test/specs/commands/recipes.js

@@ -1,11 +1,11 @@
-"use strict";
+require('source-map-support').install();
 
 var path        = require("path");
 var browserSync = require(path.resolve("./"));
 
 var pkg         = require(path.resolve("package.json"));
 var sinon       = require("sinon");
-var logger      = require("../../../lib/logger").logger;
+var logger      = require("../../../dist/logger").logger;
 var assert      = require("chai").assert;
 var cli         = require(path.resolve(pkg.bin));
 var fs          = require("fs");

test/specs/e2e/cli/e2e.cli.conf.js

@@ -7,7 +7,7 @@ var assert      = require("chai").assert;
 var sinon       = require("sinon");
 var fs          = require("fs");
 var cli         = require(path.resolve(pkg.bin));
-var utils       = require("../../../../lib/utils");
+var utils       = require("../../../../dist/utils");
 
 describe("CLI: reading config file from disk", function () {
     it("reads a config file", function (done) {

test/specs/e2e/e2e.events.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var browserSync = require("../../../index");
+var browserSync = require("../../../");
 
 var sinon   = require("sinon");
 

test/specs/e2e/e2e.fail.js

@@ -1,6 +1,6 @@
 //"use strict";
 //
-//var browserSync = require("../../../index");
+//var browserSync = require("../../../");
 //var snippetUtils       = require("../../../lib/snippetUtils");
 //
 //var assert      = require("chai").assert;