From 758efba34bb347991991e780ed31130e642e65ab Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angularjs.org>
Date: Sat, 26 Sep 2015 20:26:02 -0700
Subject: [PATCH] fix(gulp): use the new karma.Server api

Closes #4375
---
 gulpfile.js | 58 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 15 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 3114660fcc..8a33fedaf1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -610,21 +610,21 @@ gulp.task('test.unit.js', ['build.js.dev'], function (done) {
 gulp.task('test.unit.js.sauce', ['build.js.dev'], function (done) {
   var browserConf = getBrowsersFromCLI();
   if (browserConf.isSauce) {
-    karma.server.start({
+    new karma.Server({
         configFile: __dirname + '/karma-js.conf.js',
         singleRun: true,
         browserNoActivityTimeout: 240000,
         captureTimeout: 120000,
         reporters: ['dots'],
         browsers: browserConf.browsersToRun},
-      function(err) {done(); process.exit(err ? 1 : 0);});
+      function(err) {done(); process.exit(err ? 1 : 0);}).start();
   } else {
     throw new Error('ERROR: no Saucelabs browsers provided, add them with the --browsers option');
   }
 });
 
 gulp.task('!test.unit.js/karma-server', function() {
-  karma.server.start({configFile: __dirname + '/karma-js.conf.js', reporters: 'dots'});
+  new karma.Server({configFile: __dirname + '/karma-js.conf.js', reporters: 'dots'}).start();
 });
 
 
@@ -647,7 +647,11 @@ gulp.task('test.unit.router', function (done) {
 });
 
 gulp.task('!test.unit.router/karma-server', function() {
-  karma.server.start({configFile: __dirname + '/modules/angular1_router/karma-router.conf.js'});
+  new karma.Server({
+        configFile: __dirname + '/modules/angular1_router/karma-router.conf.js',
+        reporters: 'dots'
+      }
+  ).start();
 });
 
 
@@ -697,33 +701,57 @@ gulp.task('!test.unit.dart/karma-run', function (done) {
 
 
 gulp.task('!test.unit.dart/karma-server', function() {
-  karma.server.start({configFile: __dirname + '/karma-dart.conf.js', reporters: 'dots'});
+  new karma.Server({configFile: __dirname + '/karma-dart.conf.js', reporters: 'dots'}).start();
 });
 
 
 gulp.task('test.unit.router/ci', function (done) {
   var browserConf = getBrowsersFromCLI();
-  karma.server.start({configFile: __dirname + '/modules/angular1_router/karma-router.conf.js',
-      singleRun: true, reporters: ['dots'], browsers: browserConf.browsersToRun}, done);
+  new karma.Server({
+        configFile: __dirname + '/modules/angular1_router/karma-router.conf.js',
+        singleRun: true,
+        reporters: ['dots'],
+        browsers: browserConf.browsersToRun
+      },
+      done
+  ).start();
 });
 
 gulp.task('test.unit.js/ci', function (done) {
   var browserConf = getBrowsersFromCLI();
-  karma.server.start({configFile: __dirname + '/karma-js.conf.js',
-      singleRun: true, reporters: ['dots'], browsers: browserConf.browsersToRun}, done);
+  new karma.Server({
+        configFile: __dirname + '/karma-js.conf.js',
+        singleRun: true,
+        reporters: ['dots'],
+        browsers: browserConf.browsersToRun
+      },
+      done
+  ).start();
 });
 
 gulp.task('test.unit.js.sauce/ci', function (done) {
-  karma.server.start({configFile: __dirname + '/karma-js.conf.js',
-    singleRun: true, browserNoActivityTimeout: 240000, captureTimeout: 120000,
-    reporters: ['dots', 'saucelabs'], browsers: sauceConf.aliases.CI},
-    function(err) {done(); process.exit(err ? 1 : 0);});
+  new karma.Server({
+        configFile: __dirname + '/karma-js.conf.js',
+        singleRun: true,
+        browserNoActivityTimeout: 240000,
+        captureTimeout: 120000,
+        reporters: ['dots', 'saucelabs'],
+        browsers: sauceConf.aliases.CI
+      },
+      function(err) {done(); process.exit(err ? 1 : 0);}
+  ).start();
 });
 
 gulp.task('test.unit.dart/ci', function (done) {
   var browserConf = getBrowsersFromCLI();
-  karma.server.start({configFile: __dirname + '/karma-dart.conf.js',
-    singleRun: true, reporters: ['dots'], browsers: browserConf.browsersToRun}, done);
+  new karma.Server({
+        configFile: __dirname + '/karma-dart.conf.js',
+        singleRun: true,
+        reporters: ['dots'],
+        browsers: browserConf.browsersToRun
+      },
+      done
+  ).start();
 });