Merge pull request #170 from TehShrike/fixing-npm3-install

Use resolve to resolve module references instead of path.join

Author: AnkurGel

lib/server.js

@@ -12,7 +12,8 @@ var Log = require('./logger'),
   mime = require('mime'),
   send = require('send'),
   vm = require('vm'),
-  CircularJSON = require('circular-json');
+  CircularJSON = require('circular-json'),
+  resolve = require('resolve');
 
 exports.Server = function Server(bsClient, workers, config, callback) {
   var testFilePaths = (Array.isArray(config.test_path) ? config.test_path : [ config.test_path ])
@@ -70,8 +71,8 @@ exports.Server = function Server(bsClient, workers, config, callback) {
           patch += '<script type="text/javascript" src="/_patch/' + script + '"></script>\n';
         });
 
-        patch += externalScript('../node_modules/js-reporters/dist/js-reporters.js');
-        patch += externalScript('../node_modules/circular-json/build/circular-json.js');
+        patch += externalScript('js-reporters/dist/js-reporters.js');
+        patch += externalScript('circular-json/build/circular-json.js');
 
         // adding framework scripts
         if (framework === 'jasmine') {
@@ -220,7 +221,8 @@ exports.Server = function Server(bsClient, workers, config, callback) {
   }
 
   function externalScript(scriptPath) {
-    var scriptContents = fs.readFileSync(path.join(__dirname, scriptPath), { encoding: 'utf8' });
+    var resolvedPath = resolve.sync(scriptPath, { basedir: __dirname });
+    var scriptContents = fs.readFileSync(resolvedPath, { encoding: 'utf8' });
     return '<script type="text/javascript">' + scriptContents + '</script>';
   }
 

package.json

@@ -13,6 +13,7 @@
     "circular-json": "0.3.1",
     "js-reporters": "1.1.0",
     "mime": "1.3.4",
+    "resolve": "1.1.7",
     "send": "0.13.0",
     "tunnel": "0.0.3"
   },