Merge branch 'master' into feature/social-login

gulpfile.js

@@ -339,7 +339,7 @@ gulp.task('test:app',  'unit test & report frontend coverage', [], function(cb){
     plugins.runSequence('build', 'scripts:test', 'test:karma', cb);
 });
 
-gulp.task('test:karma',  'unit test the frontend', [], function(){
+gulp.task('test:karma',  'unit test the frontend', [], function(done){
 
     var files = getIndexFiles({
         devDeps: true
@@ -355,16 +355,16 @@ gulp.task('test:karma',  'unit test the frontend', [], function(){
 
     testFiles.push('app/build/js/templates.js');
 
-    return gulp.src(testFiles)
-        .pipe(plugins.karma({
-            configFile: 'karma.conf.js',
-            action: 'run'
-        }))
-        .on('error', function(err) {
-            // Make sure failed tests cause gulp to exit non-zero
-            throw err;
-        });
+    var karmaConfig = {
+        configFile: __dirname + '/karma.conf.js',
+        singleRun: true,
+        files: testFiles
+    };
+
+
+    var KarmaServer = require('karma').Server;
 
+    new KarmaServer(karmaConfig, done).start();
 });
 
 gulp.task('test:api', 'unit tests the api', [], function(){

package.json

@@ -40,7 +40,6 @@
     "gulp-css-url-adjuster": "^0.2.3",
     "gulp-filter": "^2.0.2",
     "gulp-help": "^1.3.4",
-    "gulp-karma": "0.0.4",
     "gulp-less": "^3.0.2",
     "gulp-load-plugins": "^0.10.0",
     "gulp-ng-annotate": "^0.5.2",
@@ -57,15 +56,15 @@
     "gulp-watch": "^4.2.1",
     "istanbul": "bryanforbes/istanbul#source-map-resolve",
     "json5": "^0.4.0",
-    "karma": "^0.12.31",
+    "karma": "^0.13.3",
     "karma-chai": "^0.1.0",
     "karma-chai-as-promised": "^0.1.2",
     "karma-chai-plugins": "^0.6.0",
     "karma-chrome-launcher": "^0.2.0",
     "karma-coverage": "gotwarlost/karma-coverage.git#source-lookup",
     "karma-mocha": "^0.2.0",
     "karma-mocha-reporter": "^1.0.2",
-    "karma-phantomjs-launcher": "^0.1.4",
+    "karma-phantomjs-launcher": "^0.2.0",
     "karma-sinon": "^1.0.4",
     "karma-sinon-chai": "^1.0.0",
     "lodash": "^3.6.0",