From 9795c8c2cd617e19be3ce78dce2813b9e4a55121 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Thu, 23 Apr 2020 14:41:17 -0400 Subject: [PATCH] ui: replace Makefile sed directive for coverage Use .istanbul.yml config file instead. --- ui-v2/.istanbul.yml | 4 ++++ ui-v2/GNUmakefile | 11 +++-------- 2 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 ui-v2/.istanbul.yml diff --git a/ui-v2/.istanbul.yml b/ui-v2/.istanbul.yml new file mode 100644 index 0000000000..5485bf6d76 --- /dev/null +++ b/ui-v2/.istanbul.yml @@ -0,0 +1,4 @@ +instrumentation: + excludes: [ + "!app/+(utils|search)/**/*" + ] diff --git a/ui-v2/GNUmakefile b/ui-v2/GNUmakefile index 47a892423e..dfff38541f 100644 --- a/ui-v2/GNUmakefile +++ b/ui-v2/GNUmakefile @@ -65,18 +65,13 @@ test-oss-ci: deps test-node test-node: yarn run test:node -# This seems to be the only way to only include a subset of files for coverage -# Right now we only want the /app/utils/ folder to be included for coverage -specify-coverage: - sed -i "s/exclude, include/include: ['consul-ui\/utils\/**\/*','consul-ui\/search\/**\/*']/g" ./node_modules/ember-cli-code-coverage/index.js - -test-coverage: deps specify-coverage +test-coverage: deps yarn run test:coverage -test-coverage-view: deps specify-coverage +test-coverage-view: deps yarn run test:coverage:view -test-coverage-ci: deps specify-coverage +test-coverage-ci: deps yarn run test:coverage:ci test-parallel: deps