From 045154f05663c9766584eb889bf25e9b59ffd4fd Mon Sep 17 00:00:00 2001
From: Yen Truong <ytruong@yext.com>
Date: Wed, 3 Aug 2022 14:47:16 -0400
Subject: [PATCH] update merge

---
 package.json                     |  5 +++--
 tests/scripts/all-coverage.sh    | 11 +++++++++++
 tests/scripts/unit-coverage.sh   |  4 ++++
 tests/scripts/visual-coverage.sh | 19 +++++++++++++------
 4 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100755 tests/scripts/all-coverage.sh
 create mode 100755 tests/scripts/unit-coverage.sh

diff --git a/package.json b/package.json
index 26726d2d5..537b8a990 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,9 @@
     "prepublishOnly": "npm run build",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
-    "test:unit": "jest --coverage --coverageDirectory=coverage/unit",
-    "test:visual": "./tests/scripts/visual-coverage.sh"
+    "test:unit": "./tests/scripts/unit-coverage.sh",
+    "test:visual": "./tests/scripts/visual-coverage.sh",
+    "test:all": "./tests/scripts/all-coverage.sh"
   },
   "devDependencies": {
     "@babel/core": "^7.17.5",
diff --git a/tests/scripts/all-coverage.sh b/tests/scripts/all-coverage.sh
new file mode 100755
index 000000000..523762b33
--- /dev/null
+++ b/tests/scripts/all-coverage.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# run unit test and visual coverage test
+npm run test:unit
+npm run test:visual
+
+# merge
+mkdir -p coverage/merge
+cp coverage/unit/coverage-final.json coverage/merge/coverage-final.json
+cp coverage/visual/coverage-storybook.json coverage/merge/coverage-storybook.json
+nyc report --reporter=lcov --reporter=text -t coverage/merge --report-dir coverage/merge
diff --git a/tests/scripts/unit-coverage.sh b/tests/scripts/unit-coverage.sh
new file mode 100755
index 000000000..7fa7eef24
--- /dev/null
+++ b/tests/scripts/unit-coverage.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# run jest tests and generate lcov coverage
+jest --coverage --coverageDirectory=coverage/unit
\ No newline at end of file
diff --git a/tests/scripts/visual-coverage.sh b/tests/scripts/visual-coverage.sh
index 3d637aec3..d21c5b2c3 100755
--- a/tests/scripts/visual-coverage.sh
+++ b/tests/scripts/visual-coverage.sh
@@ -1,11 +1,18 @@
-#generate coverage from storybook test runner
+#!/bin/bash
+
+#generate coverage from storybook test-runner
 start-storybook -p 6006 --ci &
-echo $! #get the background job ID
+JOB_ID=$(echo $!) #get the background job ID
 sleep 10
 test-storybook --coverage
 
-#todo: kill the start-storybook command
+# kill the start-storybook command
+kill -9 $JOB_ID
+
+#generate lcov coverage for visual tests from story book
+rm -r coverage/visual
+nyc report --reporter=lcov -t coverage/storybook --report-dir coverage/visual
 
-#generate lcov coverage
-cp coverage/storybook/coverage-storybook.json coverage/coverage-storybook.json
-nyc report --reporter=lcov -t coverage --report-dir coverage/visual
+#clean up
+cp coverage/storybook/coverage-storybook.json coverage/visual/coverage-storybook.json
+rm -r coverage/storybook
\ No newline at end of file