Merge branch 'feature/node-server' into dev-server

spalger · Jan 21, 2015 · e9eadb7 · e9eadb7
2 parents 9596ed6 + 35ac728
commit e9eadb7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/server/dev/index.js b/src/server/dev/index.js
@@ -10,6 +10,7 @@ var join = path.join;
 var rel = join.bind(null, __dirname);
 var ROOT = rel('../../../');
 var SRC = join(ROOT, 'src');
+var NODE_MODULES = join(ROOT, 'node_modules');
 var APP = join(SRC, 'kibana');
 var TEST = join(ROOT, 'test');
 
@@ -39,6 +40,8 @@ module.exports = function (app) {
   }));
 
   app.use('/test', express.static(TEST));
+  app.use('/src', express.static(SRC));
+  app.use('/node_modules', express.static(NODE_MODULES));
   app.use('/specs', function (req, res) {
     var unit = join(ROOT, '/test/unit/');
     glob(join(unit, 'specs/**/*.js'), function (er, files) {

diff --git a/tasks/config/mocha.js b/tasks/config/mocha.js
@@ -7,8 +7,8 @@ module.exports = {
   unit: {
     options: {
       urls: [
-        'http://localhost:8000/test/unit/'
+        'http://localhost:5601/test/unit/'
       ]
     }
   }
-};
+};