Skip to content

Commit 85722c9

Browse files
author
Philipp Alferov
committed
Update test configs
1 parent 6887657 commit 85722c9

File tree

3 files changed

+10
-19
lines changed

3 files changed

+10
-19
lines changed

gulpfile.babel.js

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import sequence from 'run-sequence';
88
import browserSync from 'browser-sync';
99
import fs from 'fs';
1010
import {spawn as spawn} from 'child_process';
11+
import {Server} from 'karma';
1112

1213
const $ = gulpLoadPlugins();
1314

@@ -234,17 +235,11 @@ gulp.task('release:tag', ['release:bump', 'release:commit', 'release:push'], cb
234235
});
235236
});
236237

237-
gulp.task('unit', () => {
238-
// Nonsensical source to fall back to files listed in karma.conf.js.
239-
// See https://github.com/lazd/gulp-karma/issues/9
240-
return gulp.src('./foobar')
241-
.pipe($.karma({
242-
configFile: config.tests.karma,
243-
action: 'run'
244-
}))
245-
.on('error', function(err) {
246-
throw err;
247-
});
238+
gulp.task('unit', (done) => {
239+
new Server({
240+
configFile: __dirname + '/karma.conf.js',
241+
singleRun: true
242+
}, done).start();
248243
});
249244

250245
gulp.task('release:npm', ['release:bump', 'release:commit', 'release:push', 'release:tag'], cb => {

test/karma.conf.js renamed to karma.conf.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
module.exports = function(config) {
44
config.set({
5-
basePath: '../',
5+
basePath: './',
66
frameworks: ['jasmine', 'browserify'],
77
preprocessors: {
88
'src/**/*.js': ['browserify']
99
},
1010
browsers: ['Chrome', 'Firefox'],
11-
reporters: ['nyan'],
1211
nyanReporter: {
1312
suppressErrorReport: true,
1413
suppressErrorHighlighting: true,
@@ -17,17 +16,16 @@ module.exports = function(config) {
1716
autoWatch: false,
1817
browserify: {
1918
debug: true,
20-
transform: [
21-
]
19+
transform: []
2220
},
2321
proxies: {
2422
'/': 'http://localhost:9876/'
2523
},
2624
urlRoot: '/__karma__/',
2725
singleRun: true,
2826
files: [
29-
'./node_modules/angular/angular.js',
30-
'./node_modules/angular-mocks/angular-mocks.js',
27+
'node_modules/angular/angular.js',
28+
'node_modules/angular-mocks/angular-mocks.js',
3129
'src/angular-file-saver-bundle.module.js',
3230
// Test files
3331
'test/**/*.spec.js'

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
"gulp-git": "^1.2.4",
4040
"gulp-if": "^1.2.5",
4141
"gulp-inject": "^1.5.0",
42-
"gulp-karma": "0.0.4",
4342
"gulp-load-plugins": "^0.10.0",
4443
"gulp-markdown": "^1.0.0",
4544
"gulp-plumber": "^1.0.1",
@@ -54,7 +53,6 @@
5453
"karma-chrome-launcher": "^0.2.0",
5554
"karma-firefox-launcher": "^0.1.6",
5655
"karma-jasmine": "^0.3.6",
57-
"karma-nyan-reporter": "^0.2.2",
5856
"run-sequence": "^1.1.2",
5957
"vinyl-buffer": "^1.0.0",
6058
"vinyl-source-stream": "^1.1.0",

0 commit comments

Comments
 (0)