Merge pull request #7162 from marcjansen/bring-back-coverage

Bring back coverage
This commit is contained in:
Marc Jansen
2017-08-25 00:14:58 +02:00
committed by GitHub
5 changed files with 39 additions and 4 deletions
+2 -1
View File
@@ -1,3 +1,4 @@
/build/ /build/
/node_modules/ /coverage/
/dist/ /dist/
/node_modules/
+2
View File
@@ -8,6 +8,8 @@ cache:
before_script: before_script:
- rm src/ol/renderer/webgl/*shader.js - rm src/ol/renderer/webgl/*shader.js
script: make ci script: make ci
after_success:
- cat coverage/lcov.info | coveralls
branches: branches:
only: only:
- master - master
+1
View File
@@ -68,6 +68,7 @@
"jquery": "3.2.1", "jquery": "3.2.1",
"jscodeshift": "^0.3.30", "jscodeshift": "^0.3.30",
"karma": "^1.7.0", "karma": "^1.7.0",
"karma-coverage": "^1.1.1",
"karma-chrome-launcher": "^2.1.1", "karma-chrome-launcher": "^2.1.1",
"karma-firefox-launcher": "^1.0.1", "karma-firefox-launcher": "^1.0.1",
"karma-mocha": "^1.3.0", "karma-mocha": "^1.3.0",
+33 -2
View File
@@ -49,6 +49,25 @@ module.exports = function(karma) {
proxies: { proxies: {
'/rendering/': '/base/rendering/', '/rendering/': '/base/rendering/',
'/spec/': '/base/spec/' '/spec/': '/base/spec/'
},
preprocessors: {
// source files, that you wanna generate coverage for
// do not include tests or libraries
// (these files will be instrumented by Istanbul)
'../src/**/*.js': ['coverage']
},
reporters: ['progress', 'coverage'],
coverageReporter: {
reporters: [
{
type: 'lcov', // produces HTML output and lcov
dir: '../coverage/',
subdir: '.'
},
{
type: 'text-summary' // prints the textual summary to the terminal
}
]
} }
}); });
@@ -91,11 +110,23 @@ module.exports = function(karma) {
username: 'openlayers', username: 'openlayers',
accessKey: process.env.SAUCE_ACCESS_KEY accessKey: process.env.SAUCE_ACCESS_KEY
}, },
reporters: ['dots', 'saucelabs'], reporters: ['dots', 'saucelabs', 'coverage'],
captureTimeout: 240000, captureTimeout: 240000,
browserNoActivityTimeout: 240000, browserNoActivityTimeout: 240000,
customLaunchers: customLaunchers, customLaunchers: customLaunchers,
browsers: Object.keys(customLaunchers) browsers: Object.keys(customLaunchers),
coverageReporter: {
reporters: [
{
type: 'lcovonly', // that's enough for coveralls, no HTML
dir: '../coverage/',
subdir: '.'
},
{
type: 'text-summary' // prints the textual summary to the terminal
}
]
}
}); });
} else { } else {
karma.set({ karma.set({
+1 -1
View File
@@ -502,7 +502,7 @@ goog.require('ol.renderer.webgl.Map');
} }
return { return {
describe: features[key] ? global.describe : global.xdescribe, describe: features[key] ? global.describe : global.xdescribe,
it: features[key] ? global.id : global.xit it: features[key] ? global.it : global.xit
}; };
}; };