From 3b0a0445b05c2dda894473b39d87c97350fb4c3b Mon Sep 17 00:00:00 2001
From: Jonathan Niles <jonathanwniles@gmail.com>
Date: Mon, 23 May 2016 09:26:08 +0100
Subject: [PATCH] fix(tests): revert mocha version

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.
---
 gulpfile.js             | 3 ---
 package.json            | 3 +--
 sh/integration-tests.sh | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 255189fa6e..eee82bbdb3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -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;
 
diff --git a/package.json b/package.json
index 88a89b4bd8..44503f578b 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
     "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",
@@ -73,7 +72,7 @@
     "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"
   },
diff --git a/sh/integration-tests.sh b/sh/integration-tests.sh
index 1d18056c1a..5d364ed9f8 100755
--- a/sh/integration-tests.sh
+++ b/sh/integration-tests.sh
@@ -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"