Skip to content

Commit 29f96c8

Browse files
vojtajinavojtajina
committed
chore: update karma to 0.9.4
And also add shared config to make karma configs a bit simpler.
1 parent 89efb12 commit 29f96c8

7 files changed

Lines changed: 98 additions & 74 deletions

‎karma-docs.conf.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
files = [
2-
JASMINE,
3-
JASMINE_ADAPTER,
1+
var sharedConfig = require('./karma-shared.conf');
42

5-
'build/docs/components/jquery.js',
6-
'test/jquery_remove.js',
3+
module.exports = function(config) {
4+
sharedConfig(config);
75

8-
'build/angular.js',
9-
'build/angular-cookies.js',
10-
'build/angular-mocks.js',
11-
'build/angular-resource.js',
12-
'build/angular-mobile.js',
13-
'build/angular-sanitize.js',
14-
'build/angular-route.js',
6+
config.set({
7+
files: [
8+
'build/docs/components/jquery.js',
9+
'test/jquery_remove.js',
1510

16-
'build/docs/components/lib/lunr.js/lunr.js',
17-
'build/docs/components/lib/google-code-prettify/src/prettify.js',
18-
'build/docs/components/showdown.js',
11+
'build/angular.js',
12+
'build/angular-cookies.js',
13+
'build/angular-mocks.js',
14+
'build/angular-resource.js',
15+
'build/angular-mobile.js',
16+
'build/angular-sanitize.js',
17+
'build/angular-route.js',
1918

20-
'build/docs/components/angular-bootstrap.js',
21-
'build/docs/components/angular-bootstrap-prettify.js',
22-
'build/docs/js/docs.js',
23-
'build/docs/docs-data.js',
19+
'build/docs/components/lib/lunr.js/lunr.js',
20+
'build/docs/components/lib/google-code-prettify/src/prettify.js',
21+
'build/docs/components/showdown.js',
2422

25-
'docs/component-spec/*.js'
26-
];
23+
'build/docs/components/angular-bootstrap.js',
24+
'build/docs/components/angular-bootstrap-prettify.js',
25+
'build/docs/js/docs.js',
26+
'build/docs/docs-data.js',
2727

28-
autoWatch = true;
29-
logLevel = LOG_INFO;
30-
logColors = true;
31-
browsers = ['Chrome'];
28+
'docs/component-spec/*.js'
29+
],
3230

33-
junitReporter = {
34-
outputFile: 'test_out/docs.xml',
35-
suite: 'Docs'
31+
junitReporter: {
32+
outputFile: 'test_out/docs.xml',
33+
suite: 'Docs'
34+
}
35+
});
3636
};

‎karma-e2e.conf.js‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
var angularFiles = require(__dirname + '/angularFiles.js');
1+
var sharedConfig = require('./karma-shared.conf');
22

3-
files = ['build/angular-scenario.js', ANGULAR_SCENARIO_ADAPTER, 'build/docs/docs-scenario.js'];
3+
module.exports = function(config) {
4+
sharedConfig(config);
45

5-
autoWatch = false;
6-
singleRun = true;
7-
logLevel = LOG_INFO;
8-
logColors = true;
9-
browsers = ['Chrome'];
6+
config.set({
7+
frameworks: [],
8+
files: [
9+
'build/angular-scenario.js',
10+
'node_modules/karma-ng-scenario/lib/adapter.js',
11+
'build/docs/docs-scenario.js'
12+
],
1013

11-
proxies = {
12-
// angular.js, angular-resource.js, etc
13-
'/angular': 'http://localhost:8000/build/angular',
14-
'/': 'http://localhost:8000/build/docs/'
15-
};
14+
proxies: {
15+
// angular.js, angular-resource.js, etc
16+
'/angular': 'http://localhost:8000/build/angular',
17+
'/': 'http://localhost:8000/build/docs/'
18+
},
1619

17-
junitReporter = {
18-
outputFile: 'test_out/e2e.xml',
19-
suite: 'E2E'
20+
junitReporter: {
21+
outputFile: 'test_out/e2e.xml',
22+
suite: 'E2E'
23+
}
24+
});
2025
};

‎karma-jqlite.conf.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
var angularFiles = require(__dirname + '/angularFiles.js');
1+
var angularFiles = require('./angularFiles');
2+
var sharedConfig = require('./karma-shared.conf');
23

3-
files = angularFiles.mergeFiles(JASMINE, JASMINE_ADAPTER, 'jstd');
4-
exclude = ['**/*jasmine*/**', '**/*jstd*/**'].concat(angularFiles.files.jstdExclude);
4+
module.exports = function(config) {
5+
sharedConfig(config);
56

6-
autoWatch = true;
7-
logLevel = LOG_INFO;
8-
logColors = true;
9-
browsers = ['Chrome'];
7+
config.set({
8+
files: angularFiles.mergeFiles('jstd'),
9+
exclude: angularFiles.files.jstdExclude,
1010

11-
junitReporter = {
12-
outputFile: 'test_out/jqlite.xml',
13-
suite: 'jqLite'
11+
junitReporter: {
12+
outputFile: 'test_out/jqlite.xml',
13+
suite: 'jqLite'
14+
}
15+
});
1416
};

‎karma-jquery.conf.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
var angularFiles = require(__dirname + '/angularFiles.js');
1+
var angularFiles = require('./angularFiles');
2+
var sharedConfig = require('./karma-shared.conf');
23

3-
files = angularFiles.mergeFiles(JASMINE, JASMINE_ADAPTER, 'jstdJquery');
4-
exclude = ['**/*jasmine*/**', '**/*jstd*/**'].concat(angularFiles.files.jstdJqueryExclude);
4+
module.exports = function(config) {
5+
sharedConfig(config);
56

6-
autoWatch = true;
7-
logLevel = LOG_INFO;
8-
logColors = true;
9-
browsers = ['Chrome'];
7+
config.set({
8+
files: angularFiles.mergeFiles('jstdJquery'),
9+
exclude: angularFiles.files.jstdJqueryExclude,
1010

11-
junitReporter = {
12-
outputFile: 'test_out/jquery.xml',
13-
suite: 'jQuery'
11+
junitReporter: {
12+
outputFile: 'test_out/jquery.xml',
13+
suite: 'jQuery'
14+
}
15+
});
1416
};

‎karma-modules.conf.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
var angularFiles = require(__dirname + '/angularFiles.js');
1+
var angularFiles = require('./angularFiles');
2+
var sharedConfig = require('./karma-shared.conf');
23

3-
files = angularFiles.mergeFiles(JASMINE, JASMINE_ADAPTER, 'jstdModules', 'angularSrcModules');
4-
exclude = ['**/*jasmine*/**', '**/*jstd*/**'];
4+
module.exports = function(config) {
5+
sharedConfig(config);
56

6-
autoWatch = true;
7-
logLevel = LOG_INFO;
8-
logColors = true;
9-
browsers = ['Chrome'];
7+
config.set({
8+
files: angularFiles.mergeFiles('jstdModules', 'angularSrcModules'),
109

11-
junitReporter = {
12-
outputFile: 'test_out/modules.xml',
13-
suite: 'modules'
10+
junitReporter: {
11+
outputFile: 'test_out/modules.xml',
12+
suite: 'modules'
13+
}
14+
});
1415
};

‎karma-shared.conf.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = function(config) {
2+
config.set({
3+
frameworks: ['jasmine'],
4+
autoWatch: true,
5+
logLevel: config.LOG_INFO,
6+
logColors: true,
7+
browsers: ['Chrome']
8+
});
9+
};

‎package.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616
"q-fs": "0.1.36",
1717
"qq": "0.3.5",
1818
"shelljs": "0.1.2",
19-
"karma": "0.8.4",
19+
"karma": "~0.9.4",
20+
"karma-jasmine": "~0.0.1",
21+
"karma-chrome-launcher": "~0.0.2",
22+
"karma-firefox-launcher": "~0.0.1",
23+
"karma-ng-scenario": "~0.0.1",
24+
"karma-junit-reporter": "~0.0.1",
2025
"yaml-js": "0.0.5",
2126
"showdown": "0.3.1",
2227
"rewire": "1.1.3",

0 commit comments

Comments
 (0)