Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/api-server/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ template.package = {
"dependencies": {
"compression": "^1.0.3",
"errorhandler": "^1.1.1",
"loopback": "~2.0.0-beta3",
"loopback": "~2.0.0-beta5",
"loopback-boot": "~2.0.0-beta1",
"loopback-datasource-juggler": "~2.0.0-beta2"
},
Expand Down
6 changes: 6 additions & 0 deletions templates/api-server/template/server/boot/root.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = function(server) {
// Install a `/` route that returns server status
var router = server.loopback.Router();
router.get('/', server.loopback.status());
server.use(router);
};
3 changes: 2 additions & 1 deletion templates/server/template/boot/explorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ module.exports = function mountLoopBackExplorer(server) {

var explorerApp = explorer(restApp, { basePath: restApiRoot });
server.use('/explorer', explorerApp);
server.once('started', function(baseUrl) {
server.once('started', function() {
var baseUrl = server.get('url').replace(/\/$/, '');
// express 4.x (loopback 2.x) uses `mountpath`
// express 3.x (loopback 1.x) uses `route`
var explorerPath = explorerApp.mountpath || explorerApp.route;
Expand Down
6 changes: 2 additions & 4 deletions templates/server/template/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ app.use(loopback.errorHandler());
app.start = function() {
// start the web server
return app.listen(function() {
var host = app.get('host') || '0.0.0.0';
var baseUrl = 'http://' + host + ':' + app.get('port');
app.emit('started', baseUrl);
console.log('Web server listening at: %s', baseUrl);
app.emit('started');
console.log('Web server listening at: %s', app.get('url'));
});
};

Expand Down
10 changes: 10 additions & 0 deletions test/end-to-end.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ describe('end-to-end', function() {
app = require(SANDBOX);
});

it('provides status on the root url', function(done) {
request(app)
.get('/')
.expect(200, function(err, res) {
if (err) done(err);
expect(res.body).to.have.property('uptime');
done();
});
});

it('has authentication enabled', function(done) {
request(app)
.get('/api/users')
Expand Down