From 7c0a930789f25ef3216581f1c35ecf3e8cef5ac5 Mon Sep 17 00:00:00 2001
From: Brendan Kenny <bckenny@gmail.com>
Date: Tue, 12 Mar 2019 11:30:24 -0700
Subject: [PATCH 1/3] tests: fix coverage generation

---
 jest.config.js |  1 +
 package.json   | 16 +++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 2bc0c3b318f2..587f78cb8b83 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -11,6 +11,7 @@ module.exports = {
   collectCoverageFrom: [
     '**/lighthouse-core/**/*.js',
     '**/lighthouse-cli/**/*.js',
+    '**/lighthouse-viewer/**/*.js',
     '!**/test/',
     '!**/scripts/',
   ],
diff --git a/package.json b/package.json
index 522334f1d39e..aee31c9b5f3d 100644
--- a/package.json
+++ b/package.json
@@ -28,20 +28,18 @@
     "test-viewer": "yarn unit-viewer && jest lighthouse-viewer/test/viewer-test-pptr.js",
     "test-lantern": "bash lighthouse-core/scripts/test-lantern.sh",
     "unit-core": "jest \"lighthouse-core/\"",
-    "unit-core:ci": "jest --runInBand --coverage --ci \"lighthouse-core/\"",
-    "unit-cli": "jest  --runInBand \"lighthouse-cli/\"",
-    "unit-cli:ci": "jest --runInBand --coverage --ci \"lighthouse-cli/\"",
-    "unit-viewer": "jest \"lighthouse-viewer/\"",
+    "unit-cli": "jest \"lighthouse-cli/\"",
+    "unit-viewer": "jest lighthouse-viewer/**/*-test.js",
     "unit": "yarn unit-core && yarn unit-cli && yarn unit-viewer",
-    "unit:ci": "yarn unit-core:ci && yarn unit-cli:ci && yarn unit-viewer",
+    "unit:ci": "npm run unit-core -- --runInBand --ci --coverage && npm run unit-cli -- --runInBand --ci --coverage && npm run unit-viewer -- --runInBand --ci --coverage",
     "core-unit": "yarn unit-core",
     "cli-unit": "yarn unit-cli",
     "viewer-unit": "yarn unit-viewer",
     "watch": "yarn unit-core --watch",
-    "unit:silentcoverage": "nyc --silent yarn unit:ci && nyc report --reporter text-lcov > unit-coverage.lcov",
-    "coverage": "nyc yarn unit:ci && nyc report --reporter html",
-    "smoke:silentcoverage": "nyc --silent yarn smoke && nyc report --reporter text-lcov > smoke-coverage.lcov",
-    "coverage:smoke": "nyc yarn smoke && nyc report --reporter html",
+    "unit:silentcoverage": "nyc --hook-run-in-context --silent npm run unit:ci && nyc report --reporter text-lcov > unit-coverage.lcov",
+    "coverage": "nyc --hook-run-in-context npm run unit:ci && nyc report --reporter html",
+    "smoke:silentcoverage": "nyc --silent npm run smoke && nyc report --reporter text-lcov > smoke-coverage.lcov",
+    "coverage:smoke": "nyc npm run smoke && nyc report --reporter html",
     "coveralls": "cat unit-coverage.lcov | coveralls",
     "codecov": "codecov -f unit-coverage.lcov -F unit && codecov -f smoke-coverage.lcov -F smoke",
     "devtools": "bash lighthouse-core/scripts/roll-to-devtools.sh",

From 1b3a3b3c5da00e7779b19bedfdbf47477fee1536 Mon Sep 17 00:00:00 2001
From: Brendan Kenny <bckenny@gmail.com>
Date: Tue, 12 Mar 2019 12:30:58 -0700
Subject: [PATCH 2/3] more coverage npm script cleanup

---
 .travis.yml  |  4 ++--
 package.json | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad9440beff08..506451877ea9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,9 +33,9 @@ script:
   - yarn bundlesize
   - yarn diff:sample-json
   - yarn lint
-  - yarn unit:silentcoverage
+  - yarn unit:cicoverage
   - yarn type-check
-  - yarn smoke:silentcoverage
+  - yarn smoke:cicoverage
   - yarn test-clients
   - yarn test-viewer
   - yarn test-lantern
diff --git a/package.json b/package.json
index aee31c9b5f3d..3a686223db3d 100644
--- a/package.json
+++ b/package.json
@@ -36,10 +36,10 @@
     "cli-unit": "yarn unit-cli",
     "viewer-unit": "yarn unit-viewer",
     "watch": "yarn unit-core --watch",
-    "unit:silentcoverage": "nyc --hook-run-in-context --silent npm run unit:ci && nyc report --reporter text-lcov > unit-coverage.lcov",
-    "coverage": "nyc --hook-run-in-context npm run unit:ci && nyc report --reporter html",
-    "smoke:silentcoverage": "nyc --silent npm run smoke && nyc report --reporter text-lcov > smoke-coverage.lcov",
-    "coverage:smoke": "nyc npm run smoke && nyc report --reporter html",
+    "unit:cicoverage": "nyc --all --hook-run-in-context npm run unit:ci && nyc report --reporter text-lcov > unit-coverage.lcov",
+    "coverage": "yarn unit:cicoverage && nyc report --reporter html",
+    "smoke:cicoverage": "nyc npm run smoke && nyc report --reporter text-lcov > smoke-coverage.lcov",
+    "coverage:smoke": "yarn smoke:cicoverage && nyc report --reporter html",
     "coveralls": "cat unit-coverage.lcov | coveralls",
     "codecov": "codecov -f unit-coverage.lcov -F unit && codecov -f smoke-coverage.lcov -F smoke",
     "devtools": "bash lighthouse-core/scripts/roll-to-devtools.sh",
@@ -184,14 +184,18 @@
   ],
   "nyc": {
     "reporter": [
-      "lcov",
-      "text"
+      "text-summary"
     ],
     "tempDirectory": "./coverage",
+    "include": [
+      "**/lighthouse-core/**/*.js",
+      "**/lighthouse-cli/**/*.js",
+      "**/lighthouse-viewer/**/*.js"
+    ],
     "exclude": [
       "**/third_party/**",
       "**/test/",
-      "clients/"
+      "**/scripts/"
     ]
   },
   "homepage": "https://github.com/GoogleChrome/lighthouse#readme",

From 7c333ae797d58b176e8f7af852963f971d028349 Mon Sep 17 00:00:00 2001
From: Brendan Kenny <bckenny@gmail.com>
Date: Tue, 12 Mar 2019 12:40:22 -0700
Subject: [PATCH 3/3] gitignore

---
 .gitignore | 1 +
 .npmignore | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 52e133b51188..7ca46ac3ee91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ npm-debug.log
 coverage
 lcov.info
 .nyc_output
+*.lcov
 
 lighthouse-cli/results
 results.html
diff --git a/.npmignore b/.npmignore
index 35cb8d46e027..9b7254d0f506 100644
--- a/.npmignore
+++ b/.npmignore
@@ -40,6 +40,7 @@ latest.artifacts.log
 npm-debug.log
 yarn-error.log
 results.html
+*.lcov
 
 # dev files
 .appveyor.yml