Merge pull request #1200 from meanjs/node5-support

Update Mocha
This commit is contained in:
Liran Tal
2016-02-12 00:41:22 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -99,7 +99,7 @@ describe('User CRUD tests', function () {
// 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) {
if (process.version.indexOf('v4') === 0 || process.version.indexOf('v5') === 0) {
signoutRes.text.should.equal('Found. Redirecting to /');
} else {
signoutRes.text.should.equal('Moved Temporarily. Redirecting to /');

View File

@@ -44,7 +44,7 @@
"jasmine-core": "~2.3.4",
"lodash": "~3.10.0",
"method-override": "~2.3.3",
"mocha": "~1.20.0",
"mocha": "~2.4.5",
"mongoose": "~4.2.3",
"morgan": "~1.6.1",
"multer": "~1.0.5",
@@ -115,7 +115,7 @@
"karma-ng-html2js-preprocessor": "~0.1.2",
"karma-phantomjs-launcher": "~0.2.0",
"load-grunt-tasks": "~3.2.0",
"mock-fs": "~3.4.0",
"mock-fs": "~3.7.0",
"run-sequence": "~1.1.1",
"should": "~7.0.1",
"supertest": "~1.0.1",