Skip to content

Commit e34b216

Browse files
author
Chris Boden
committed
Updated testing config for latest version
1 parent 3979163 commit e34b216

File tree

2 files changed

+30
-25
lines changed

2 files changed

+30
-25
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"grunt-contrib-jshint": "*",
2020
"grunt-contrib-uglify": "*",
2121
"grunt-karma": "*",
22+
"karma-coverage": "*",
2223
"grunt-jsdoc": "*",
2324
"jshint": "~2.1.4",
2425
"jsdoc": "~3.2.0"

test/karma.conf.js

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
1-
basePath = '../';
1+
module.exports = function(config) {
2+
config.set({
3+
basePath: '../',
24

3-
files = [
4-
JASMINE,
5-
JASMINE_ADAPTER,
6-
'https://maps.googleapis.com/maps/api/js?sensor=false',
7-
'http://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js',
8-
'test/lib/angular/angular.js',
9-
'test/lib/angular/angular-mocks.js',
10-
'src/module.js',
11-
'src/directives/*.js',
12-
'src/services/*.js',
13-
'src/controllers/*.js',
14-
'test/unit/**/*.js'
15-
];
5+
files: [
6+
'https://maps.googleapis.com/maps/api/js?sensor=false',
7+
'http://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js',
8+
'test/lib/angular/angular.js',
9+
'test/lib/angular/angular-mocks.js',
10+
'src/module.js',
11+
'src/directives/*.js',
12+
'src/services/*.js',
13+
'src/controllers/*.js',
14+
'test/unit/**/*.js'
15+
],
1616

17-
autoWatch = true;
18-
singleRun = false;
19-
browsers = ['PhantomJS'];
20-
reportSlowerThan = 500;
17+
frameworks: ["jasmine"],
2118

22-
preprocessors = {
23-
'src/**/*.js': 'coverage'
24-
};
19+
autoWatch: true,
20+
singleRun: false,
21+
browsers: ['PhantomJS'],
22+
reportSlowerThan: 500,
23+
24+
preprocessors: {
25+
'src/**/*.js': 'coverage'
26+
},
2527

26-
reporters = ['progress', 'coverage'];
28+
reporters: ['progress', 'coverage'],
2729

28-
coverageReporter = {
29-
type : 'html',
30-
dir : 'test/coverage/'
30+
coverageReporter: {
31+
type : 'html',
32+
dir : 'test/coverage/'
33+
}
34+
});
3135
};
3236

0 commit comments

Comments
 (0)