kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/psimyn-speedup-karma' into 43511-upgrade-to-babel-7 

* origin/psimyn-speedup-karma:
  Fix lint and comments
  Speed up karma runs for development
This commit is contained in:
Mike Greiling 2018-10-02 14:58:39 -05:00
parent 63bc9a60c5 47a87fbcd8
commit 1efed5d389
No known key found for this signature in database
GPG Key ID: 0303DF507FA67596
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/karma.config.js
View File

@ -6,6 +6,7 @@ const argumentsParser = require('commander');
const webpackConfig = require('./webpack.config.js');
const ROOT_PATH = path.resolve(__dirname, '..');
const GENERATE_COVERAGE_REPORT = process.env.BABEL_ENV === 'coverage' || process.env.NODE_ENV === 'coverage';
function fatalError(message) {
console.error(chalk.red(`\nError: ${message}\n`));
@ -22,6 +23,10 @@ webpackConfig.optimization.splitChunks = false;
// use quicker sourcemap option
webpackConfig.devtool = 'cheap-inline-source-map';
webpackConfig.plugins.push(
new webpack.DefinePlugin({ GENERATE_COVERAGE_REPORT }),
);
const specFilters = argumentsParser
.option(
'-f, --filter-spec [filter]',
@ -118,7 +123,7 @@ module.exports = function(config) {
};
}
if (process.env.BABEL_ENV === 'coverage' || process.env.NODE_ENV === 'coverage') {
if (GENERATE_COVERAGE_REPORT) {
karmaConfig.reporters.push('coverage-istanbul');
karmaConfig.coverageIstanbulReporter = {
reports: ['html', 'text-summary'],

2
spec/javascripts/test_bundle.js
View File

@ -155,7 +155,7 @@ describe('test errors', () => {
// if we're generating coverage reports, make sure to include all files so
// that we can catch files with 0% coverage
// see: https://github.com/deepsweet/istanbul-instrumenter-loader/issues/15
if (process.env.BABEL_ENV === 'coverage') {
if (GENERATE_COVERAGE_REPORT) { // eslint-disable-line no-undef
// exempt these files from the coverage report
const troubleMakers = [
'./blob_edit/blob_bundle.js',