fix: ensure test scripts only kill node process

This commit is a critical fix to make sure the test scripts only kill
the process they started, rather than all node processes globally.  This
had the side effect of killing any other node instances, including `npm`
downloads and `node-gyp` builds.  It has been fixed.

gulpfile.js

@@ -41,7 +41,6 @@ const SERVER_FOLDER = './bin/server/';
 // the output folder for built client files
 const CLIENT_FOLDER = './bin/client/';
 
-
 // resource paths
 var paths = {
   client : {
@@ -216,7 +215,7 @@ gulp.task('client-lint-i18n', function (cb) {
  	});
 });
 
-// watchs for any change and builds the appropriate route
+// watches for any change and builds the appropriate route
 gulp.task('watch-client', function () {
   gulp.watch(paths.client.css, ['client-minify-css']);
   gulp.watch(paths.client.javascript, ['client-compile-js']);

sh/integration-tests.sh

@@ -22,7 +22,10 @@ mysql -u $DB_USER -p$DB_PASS $DB_NAME < server/models/test/data.sql
 echo "Building server ...."
 
 # build and start the server
-npm run dev &
+./node_modules/.bin/gulp build
+cd bin
+NODE_ENV=development node server/app.js &
+NODE_PID=$!
 
 # make sure we have enough time for the server to start
 sleep $TIMEOUT
@@ -32,7 +35,7 @@ echo "Running tests ..."
 # run the tests
 mocha server/test/api/
 
-echo "Cleaning up node instances ..."
+echo "Cleaning up test instance"
 
-# kill the server (and all other matching processes)
-killall node
+# kill the server
+kill $NODE_PID

sh/test-ends.sh

@@ -22,9 +22,13 @@ mysql -u $DB_USER -p$DB_PASS $DB_NAME < server/models/test/data.sql
 echo "Building server ...."
 
 # build and start the server
-npm run dev &
+./node_modules/.bin/gulp build
+cd bin
+NODE_ENV=development node server/app.js &
+NODE_PID=$!
 
 # make sure we have enough time for the server to start
+echo "Sleeping for $TIMEOUT"
 sleep $TIMEOUT
 
 echo "Running tests ..."
@@ -34,5 +38,5 @@ gulp client-test-e2e
 
 echo "Cleaning up node instances ..."
 
-# kill the server (and all other matching processes)
-killall node
+# kill the server
+kill $NODE_PID