diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-10-02 22:58:39 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-10-02 23:15:43 +0300 |
commit | 1efed5d3892618f0161506d1bade19738c418c64 (patch) | |
tree | 9b2ea76202777233c74bb89f349b691ca242bfcc | |
parent | 63bc9a60c5e43c38733c9b9dc6ae0669c9cc4515 (diff) | |
parent | 47a87fbcd80e416a45b87499f5b6f9052990c1aa (diff) |
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
-rw-r--r-- | config/karma.config.js | 7 | ||||
-rw-r--r-- | spec/javascripts/test_bundle.js | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 74dc5c13c70..cad3c0e9193 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -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'], diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index 96c0844f83c..d0fba401115 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -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', |