projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #625 from kkirsche/patch-1
[dygraphs.git]
/
auto_tests
/
karma.conf.js
diff --git
a/auto_tests/karma.conf.js
b/auto_tests/karma.conf.js
index
2f152dc
..
606c571
100644
(file)
--- a/
auto_tests/karma.conf.js
+++ b/
auto_tests/karma.conf.js
@@
-1,21
+1,28
@@
module.exports = function (config) {
config.set({
basePath: '../',
module.exports = function (config) {
config.set({
basePath: '../',
- frameworks: ['mocha', 'chai', 'chai-as-promised', 'sinon-chai', 'chai-things', 'dirty-chai'],
+ frameworks: [
+ 'mocha',
+ 'chai'
+ ],
files: [
files: [
- 'auto_tests/**.js',
- 'dist/dygraph-combined.dev.js',
+ 'dist/dygraph-combined-dev.js',
'src/extras/smooth-plotter.js',
'src/extras/smooth-plotter.js',
+ 'auto_tests/data/*.js',
+ 'auto_tests/tests/*.js',
],
autoWatch: false,
singleRun: true,
],
autoWatch: false,
singleRun: true,
- reporters: ['
spec', 'coverage'],
+ reporters: ['
mocha', 'coverage'], // or 'dots', 'mocha', 'spec'
preprocessors: {
preprocessors: {
- 'dist/dygraph-combined
.
dev.js': ['coverage']
+ 'dist/dygraph-combined
-
dev.js': ['coverage']
},
coverageReporter: {
},
coverageReporter: {
- type: 'html',
- dir: 'dist/coverage'
+ dir: 'dist/coverage',
+ reporters: [
+ { type: 'html', subdir: 'report-html' },
+ { type: 'lcovonly', subdir: 'report-lcov' },
+ ]
},
browsers: ['PhantomJS'],
plugins: [
},
browsers: ['PhantomJS'],
plugins: [
@@
-23,7
+30,8
@@
module.exports = function (config) {
'karma-chai-plugins',
'karma-phantomjs-launcher',
'karma-coverage',
'karma-chai-plugins',
'karma-phantomjs-launcher',
'karma-coverage',
- 'karma-spec-reporter'
+ 'karma-spec-reporter',
+ 'karma-mocha-reporter'
]
});
};
]
});
};