Merge pull request #2283 from strongloop/add-node-v6-to-travis
travis: drop node@5, add node@6
This commit is contained in:
commit
097984154b
|
@ -4,5 +4,5 @@ node_js:
|
|||
- "0.10"
|
||||
- "0.12"
|
||||
- "4"
|
||||
- "5"
|
||||
- "6"
|
||||
|
||||
|
|
|
@ -565,7 +565,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);
|
||||
}
|
||||
|
|
|
@ -79,10 +79,11 @@
|
|||
"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",
|
||||
"mocha": "^2.1.0",
|
||||
"phantomjs-prebuilt": "^2.1.7",
|
||||
"sinon": "^1.13.0",
|
||||
"sinon-chai": "^2.8.0",
|
||||
"strong-task-emitter": "^0.0.6",
|
||||
|
|
Loading…
Reference in New Issue