diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d64e795d64..abfefb64249 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,7 +113,7 @@ jobs: steps: - browser-tools/install-chrome: replace-existing: false - - run: npm run test:coverage -- --browsers=<> + - run: npm run test -- --browsers=<> - save_cache_cmd: node-version: <> - store_test_results: diff --git a/package.json b/package.json index 0d47653ca7f..2ffe6ecb952 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,6 @@ "vue": "2.6.14", "vue-eslint-parser": "8.2.0", "vue-loader": "15.9.8", - "vue-template-babel-compiler": "^1.0.7", "vue-template-compiler": "2.6.14", "webpack": "5.68.0", "webpack-cli": "4.9.2", @@ -89,9 +88,8 @@ "build:watch": "webpack --config webpack.dev.js --watch", "info": "npx envinfo --system --browsers --npmPackages --binaries --languages --markdown", "test": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run", + "test:firefox": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run --browsers=FirefoxHeadless", "test:debug": "cross-env NODE_ENV=debug karma start --no-single-run", - "test:coverage": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" COVERAGE=true karma start --single-run", - "test:coverage:firefox": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" COVERAGE=true karma start --single-run --browsers=FirefoxHeadless", "test:e2e:ci": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome smoke default condition timeConductor", "test:e2e:local": "npx playwright test --config=e2e/playwright-local.config.js --project=chrome", "test:e2e:visual": "percy exec --config ./e2e/.percy.yml -- npx playwright test --config=e2e/playwright-visual.config.js default", diff --git a/webpack.coverage.js b/webpack.coverage.js index 6d4fc77d6cb..94766eb6c84 100644 --- a/webpack.coverage.js +++ b/webpack.coverage.js @@ -10,14 +10,20 @@ config.devtool = false; const vueLoaderRule = config.module.rules.find(r => r.use === 'vue-loader'); vueLoaderRule.use = { - loader: 'vue-loader', + loader: 'vue-loader' // Attempt to use Babel with babel-plugin-istanbul - options: { - compiler: require('vue-template-babel-compiler'), - compilerOptions: { - babelOptions: require('./babel.coverage') - } - } + + // TODO The purpose of this was to try to add coverage to JS expressions + // inside `