Skip to content
This repository has been archived by the owner on Mar 31, 2024. It is now read-only.

Commit

Permalink
Merge branch 'feature/node-server' into dev-server
Browse files Browse the repository at this point in the history
  • Loading branch information
w33ble committed Jan 21, 2015
2 parents 9596ed6 + 35ac728 commit e9eadb7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/server/dev/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions tasks/config/mocha.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ module.exports = {
unit: {
options: {
urls: [
'http://localhost:8000/test/unit/'
'http://localhost:5601/test/unit/'
]
}
}
};
};

0 comments on commit e9eadb7

Please sign in to comment.