Skip to content

Commit

Permalink
fix(tests): revert mocha version
Browse files Browse the repository at this point in the history
This commit fixes the mocha version at 2.4.5, since the latest version
(2.5.0) is broken.  It also removes the unused dependency on gulp-mocha.
Finally, it ensures that integration tests are calling local mocha
instead of global mocha.
  • Loading branch information
jniles committed May 23, 2016
1 parent 0ff4a2a commit 3b0a044
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
3 changes: 0 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ const rimraf = require('rimraf');
const gutil = require('gulp-util');
const less = require('gulp-less');

// mocha for server-side testing
const mocha = require('gulp-mocha');

// child process for custom scripts
const exec = require('child_process').exec;

Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,14 @@
"gulp-iife": "^0.3.0",
"gulp-jshint": "^2.0.0",
"gulp-less": "^3.0.3",
"gulp-mocha": "^2.1.3",
"gulp-uglify": "^1.5.2",
"gulp-util": "^3.0.7",
"jshint": "^2.8.0",
"karma": "^0.13.22",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^1.0.1",
"karma-mocha": "^1.0.1",
"mocha": "^2.4.5",
"mocha": "2.4.5",
"protractor": "^3.1.1",
"rimraf": "^2.4.3"
},
Expand Down
2 changes: 1 addition & 1 deletion sh/integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ sleep $TIMEOUT
echo "Running tests ..."

# run the tests
mocha server/test/api/
../node_modules/.bin/mocha server/test/api/

echo "Cleaning up test instance"

Expand Down

0 comments on commit 3b0a044

Please sign in to comment.