Skip to content

Commit 14f9065

Browse files
committed
Sort out karma 6 deprecation message
1 parent ecf77c1 commit 14f9065

File tree

2 files changed

+19
-704
lines changed

2 files changed

+19
-704
lines changed

gulpfile.js

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
'use strict';
2+
13
var gulp = require('gulp');
24
var del = require('del');
35
var rename = require('gulp-rename');
46
var Server = require('karma').Server;
7+
var parseConfig = require('karma').config.parseConfig;
58
var typeScriptCompiler = require('gulp-typescript');
69
var uglify = require('gulp-uglify');
710
var replace = require('gulp-replace');
@@ -78,17 +81,25 @@ gulp.task('tidy', function() {
7881
});
7982

8083
gulp.task('karmaTest', function(done) {
81-
return new Server({
82-
configFile: rootDir + '/test/karma.conf.js',
83-
singleRun: true
84-
}, done).start();
84+
parseConfig(
85+
rootDir + '/test/karma.conf.js',
86+
{singleRun: true},
87+
{promiseConfig: true, throwErrors: true}
88+
).then(function (config) {
89+
var server = new Server(config, done);
90+
server.start();
91+
});
8592
});
8693

8794
gulp.task('midwayTest', function(done) {
88-
return new Server({
89-
configFile: rootDir + '/test/karma.midway.conf.js',
90-
singleRun: true
91-
}, done).start();
95+
parseConfig(
96+
rootDir + '/test/karma.midway.conf.js',
97+
{singleRun: true},
98+
{promiseConfig: true, throwErrors: true}
99+
).then(function (config) {
100+
var server = new Server(config, done);
101+
server.start();
102+
});
92103
});
93104

94105
gulp.task('apiTest', function () {

0 commit comments

Comments
 (0)