Merge pull request #2288 from strongloop/support-node-v6-in-2.x

Support node v6 in 2.x
This commit is contained in:
Miroslav Bajtoš 2016-05-04 09:16:46 +02:00
commit 692c67384a
3 changed files with 8 additions and 3 deletions

View File

@ -4,5 +4,5 @@ node_js:
- "0.10"
- "0.12"
- "4"
- "5"
- "6"

View File

@ -571,7 +571,11 @@ app.listen = function(cb) {
(arguments.length == 1 && typeof arguments[0] == 'function');
if (useAppConfig) {
server.listen(this.get('port'), this.get('host'), cb);
var port = this.get('port');
// NOTE(bajtos) port:undefined no longer works on node@6,
// we must pass port:0 explicitly
if (port === undefined) port = 0;
server.listen(port, this.get('host'), cb);
} else {
server.listen.apply(server, arguments);
}

View File

@ -78,12 +78,13 @@
"karma-html2js-preprocessor": "^0.1.0",
"karma-junit-reporter": "^0.2.2",
"karma-mocha": "^0.1.10",
"karma-phantomjs-launcher": "^0.1.4",
"karma-phantomjs-launcher": "^1.0.0",
"karma-script-launcher": "^0.1.0",
"loopback-boot": "^2.7.0",
"loopback-datasource-juggler": "^2.19.1",
"loopback-testing": "~1.1.0",
"mocha": "^2.1.0",
"phantomjs-prebuilt": "^2.1.7",
"sinon": "^1.13.0",
"sinon-chai": "^2.8.0",
"strong-task-emitter": "^0.0.6",