Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
adding the required support to properly build the nodejs v4 edition
Browse files Browse the repository at this point in the history
updating grunt-node-inspector version to compatible version with nodejs v4
  • Loading branch information
lirantal committed Oct 6, 2015
1 parent 3ff893a commit b7a57ab
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
12 changes: 11 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,23 @@ node_js:
- 0.10
- 0.12
- 4
# NodeJS v4 requires gcc 4.8
env:
- NODE_ENV=travis
- NODE_ENV=travis CXX="g++-4.8" CC="gcc-4.8"
matrix:
allow_failures:
- node_js: 4
services:
- mongodb
# gcc 4.8 requires ubuntu-toolchain-r-test
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- gcc-4.8
- clang
before_install:
- gem update --system
- gem install sass --version "=3.3.7"
Expand Down
10 changes: 9 additions & 1 deletion modules/users/tests/server/user.server.routes.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,15 @@ describe('User CRUD tests', function () {
}

signoutRes.redirect.should.equal(true);
signoutRes.text.should.equal('Moved Temporarily. Redirecting to /');

// NodeJS v4 changed the status code representation so we must check
// before asserting, to be comptabile with all node versions.
if (process.version.indexOf('v4') === 0) {
signoutRes.text.should.equal('Found. Redirecting to /');
} else {
signoutRes.text.should.equal('Moved Temporarily. Redirecting to /');
}

return done();
});
});
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"passport-twitter": "^1.0.2",
"phantomjs": ">=1.9.0",
"serve-favicon": "^2.3.0",
"socket.io": "^1.3.5",
"socket.io": "^1.3.7",
"swig": "^1.4.2",
"validator": "^3.41.2"
},
Expand All @@ -79,7 +79,7 @@
"grunt-mocha-test": "~0.12.7",
"grunt-mocha-istanbul": "^2.4.0",
"grunt-ng-annotate": "^1.0.1",
"grunt-node-inspector": "~0.2.0",
"grunt-node-inspector": "~0.3.0",
"grunt-nodemon": "~0.4.0",
"grunt-protractor-runner": "^2.0.0",
"gulp": "^3.9.0",
Expand Down

0 comments on commit b7a57ab

Please sign in to comment.