refactor(tests) Get test script working again. Tidy up gulp file.

mchapman · mchapman · commit b627c0732792 · 2015-10-17T01:09:42.000+01:00
diff --git a/gulpfile.js b/gulpfile.js
@@ -18,8 +18,6 @@ gulp.task('all', function(callback) {
     'clean',
     'build',
     'test',
-    'midwayTest',
-    'apiTest',
     callback);
 });
 
@@ -74,7 +72,15 @@ gulp.task('map', function() {
   )();
 });
 
-gulp.task('test', function(done) {
+gulp.task('test', function(callback) {
+  runSequence(
+    'karmaTest',
+    'midwayTest',
+    'apiTest',
+    callback);
+});
+
+gulp.task('karmaTest', function(done) {
   new Server({
     configFile: rootDir + '/config/karma.conf.js',
     singleRun: true
diff --git a/scripts/testrun.sh b/scripts/testrun.sh
@@ -1,8 +1,3 @@
 #!/bin/bash
+gulp test
 
-KARMA=./node_modules/karma/bin/karma
-MOCHA=./node_modules/mocha/bin/mocha
-
-$KARMA start config/karma.conf.js --no-auto-watch --single-run --reporters=dots --browsers=PhantomJS
-$KARMA start config/karma.midway.conf.js --no-auto-watch --single-run --reporters=dots --browsers=PhantomJS
-$MOCHA test/api/*Spec.js
