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

NodeJS v4 support - fixing the failed build #922

Merged
merged 1 commit into from
Oct 6, 2015
Merged

NodeJS v4 support - fixing the failed build #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion .travis.yml
View file
Open in desktop
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:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are attempting to get Node 4 passing, we should remove this section.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that's the reason for it, but rather node-inspector which is failing.

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
View file
Open in desktop
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
View file
Open in desktop
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