Skip to content

Commit 7deec10

Browse files
chore(karma): update to 0.10.x
1 parent 1f3b5f1 commit 7deec10

File tree

2 files changed

+80
-58
lines changed

2 files changed

+80
-58
lines changed

karma.conf.js

Lines changed: 76 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,76 @@
1-
2-
// base path, that will be used to resolve files and exclude
3-
basePath = '.';
4-
5-
// list of files / patterns to load in the browser
6-
files = [
7-
JASMINE,
8-
JASMINE_ADAPTER,
9-
'lib/jquery-1.8.3/jquery-1.8.3.js',
10-
'lib/jquery-ui-1.9.2/js/datepicker.js',
11-
'lib/angular/1.0.4/angular.js',
12-
'lib/angular/1.0.4/angular-mocks.js',
13-
'1820EN_*/**/*.js'
14-
];
15-
16-
// list of files to exclude
17-
exclude = [
18-
'1820EN_01_Code/**',
19-
'1820EN_02_Code/10 - testing - karma tips and tricks/**',
20-
'1820EN_05_Code/**',
21-
'1820EN_06_Code/**',
22-
'1820EN_09_Code/01_directive_test_skeleton/test.js'
23-
];
24-
25-
// Start these browsers, currently available:
26-
// - Chrome
27-
// - ChromeCanary
28-
// - Firefox
29-
// - Opera
30-
// - Safari
31-
// - PhantomJS
32-
browsers = ['Chrome'];
33-
34-
// test results reporter to use
35-
// possible values: dots || progress
36-
reporter = 'progress';
37-
38-
// web server port
39-
port = 9018;
40-
41-
// cli runner port
42-
runnerPort = 9100;
43-
44-
// enable / disable colors in the output (reporters and logs)
45-
colors = true;
46-
47-
// level of logging
48-
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
49-
logLevel = LOG_INFO;
50-
51-
// enable / disable watching file and executing tests whenever any file changes
52-
autoWatch = true;
53-
54-
// Continuous Integration mode
55-
// if true, it capture browsers, run tests and exit
56-
singleRun = true;
1+
// Karma configuration
2+
// Generated on Wed Nov 27 2013 09:32:17 GMT+0000 (GMT Standard Time)
3+
4+
module.exports = function(config) {
5+
config.set({
6+
7+
// base path, that will be used to resolve files and exclude
8+
basePath: '',
9+
10+
11+
// frameworks to use
12+
frameworks: ['jasmine'],
13+
14+
15+
// list of files / patterns to load in the browser
16+
files: [
17+
'lib/jquery-1.8.3/jquery-1.8.3.js',
18+
'lib/jquery-ui-1.9.2/js/datepicker.js',
19+
'lib/angular/1.0.4/angular.js',
20+
'lib/angular/1.0.4/angular-mocks.js',
21+
'1820EN_*/**/*.js'
22+
],
23+
24+
25+
// list of files to exclude
26+
exclude: [
27+
'1820EN_01_Code/**',
28+
'1820EN_02_Code/10*/**',
29+
'1820EN_05_Code/**',
30+
'1820EN_06_Code/**',
31+
'1820EN_09_Code/01*/**'
32+
],
33+
34+
35+
// test results reporter to use
36+
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
37+
reporters: ['progress'],
38+
39+
40+
// web server port
41+
port: 9876,
42+
43+
44+
// enable / disable colors in the output (reporters and logs)
45+
colors: true,
46+
47+
48+
// level of logging
49+
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
50+
logLevel: config.LOG_INFO,
51+
52+
53+
// enable / disable watching file and executing tests whenever any file changes
54+
autoWatch: true,
55+
56+
57+
// Start these browsers, currently available:
58+
// - Chrome
59+
// - ChromeCanary
60+
// - Firefox
61+
// - Opera (has to be installed with `npm install karma-opera-launcher`)
62+
// - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
63+
// - PhantomJS
64+
// - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
65+
browsers: ['Chrome'],
66+
67+
68+
// If browser does not capture in given timeout [ms], kill it
69+
captureTimeout: 60000,
70+
71+
72+
// Continuous Integration mode
73+
// if true, it capture browsers, run tests and exit
74+
singleRun: false
75+
});
76+
};

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
"description": "Angular Book Samples",
55
"dependencies": {},
66
"devDependencies": {
7-
"grunt": "~0.3.17"
8-
},
7+
"grunt": "~0.3.17",
8+
"karma": "~0.10.6",
9+
"karma-jasmine": "~0.1.3"
10+
},
911
"scripts": {},
1012
"repository": {
1113
"type": "git",

0 commit comments

Comments
 (0)