From 6f85c0fecd1543c9cc02a3b18f61775517be6075 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gr=C3=A9goire=20Aubert?= <gregoire.aubert@sonarsource.com>
Date: Thu, 31 Jan 2019 17:13:44 +0100
Subject: [PATCH] Enable coverage for web app

---
 server/sonar-docs/.gitignore   |  4 ++++
 server/sonar-vsts/.gitignore   |  1 +
 server/sonar-vsts/build.gradle |  1 +
 server/sonar-vsts/package.json | 14 ++++++++------
 server/sonar-web/.gitignore    |  1 +
 server/sonar-web/build.gradle  |  1 +
 server/sonar-web/package.json  | 14 ++++++++------
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/server/sonar-docs/.gitignore b/server/sonar-docs/.gitignore
index d1d97452f5b..b93c463eaba 100644
--- a/server/sonar-docs/.gitignore
+++ b/server/sonar-docs/.gitignore
@@ -11,3 +11,7 @@ public
 
 # Mac files
 .DS_Store
+
+# tests
+lcov.info
+coverage/
diff --git a/server/sonar-vsts/.gitignore b/server/sonar-vsts/.gitignore
index 170910afa26..f50cd68a3d6 100644
--- a/server/sonar-vsts/.gitignore
+++ b/server/sonar-vsts/.gitignore
@@ -23,6 +23,7 @@ build/
 # tests
 src/test/json/**/*.png
 lcov.info
+coverage/
 .nyc_output
 
 # eslint
diff --git a/server/sonar-vsts/build.gradle b/server/sonar-vsts/build.gradle
index c1631df9969..807b81879e9 100644
--- a/server/sonar-vsts/build.gradle
+++ b/server/sonar-vsts/build.gradle
@@ -6,6 +6,7 @@ sonarqube {
     property "sonar.test.inclusions", "src/main/js/**/__tests__/**"
     property "sonar.exclusions", "src/main/js/libs/third-party/**/*,src/main/js/**/__tests__/**"
     property "sonar.eslint.reportPaths", "eslint-report.json"
+    property "sonar.typescript.lcov.reportPaths", "coverage/lcov.info"
   }
 }
 
diff --git a/server/sonar-vsts/package.json b/server/sonar-vsts/package.json
index f6b144b28df..b5880df936e 100644
--- a/server/sonar-vsts/package.json
+++ b/server/sonar-vsts/package.json
@@ -78,7 +78,7 @@
     "lint-report": "eslint --ext js,ts,tsx -f json -o eslint-report.json src/main/js",
     "ts-check": "tsc --noEmit",
     "validate": "yarn lint && yarn ts-check && yarn format-check && yarn test",
-    "validate-ci": "yarn lint-report && yarn ts-check && yarn format-check && yarn test"
+    "validate-ci": "yarn lint-report && yarn ts-check && yarn format-check && yarn test --coverage"
   },
   "engines": {
     "node": ">=6"
@@ -91,10 +91,12 @@
     "IE 11"
   ],
   "jest": {
-    "coverageDirectory": "<rootDir>/target/coverage",
-    "coveragePathIgnorePatterns": [
-      "<rootDir>/node_modules",
-      "<rootDir>/tests"
+    "coverageDirectory": "<rootDir>/coverage",
+    "collectCoverageFrom": [
+      "src/main/js/**/*.{ts,tsx}"
+    ],
+    "coverageReporters": [
+      "lcovonly"
     ],
     "globals": {
       "ts-jest": {
@@ -124,8 +126,8 @@
       "enzyme-to-json/serializer"
     ],
     "testPathIgnorePatterns": [
+      "<rootDir>/config",
       "<rootDir>/node_modules",
-      "<rootDir>/src/main/webapp",
       "<rootDir>/scripts"
     ],
     "testRegex": "(/__tests__/.*|\\-test)\\.(ts|tsx|js)$",
diff --git a/server/sonar-web/.gitignore b/server/sonar-web/.gitignore
index 0a333c184de..6a8e2e6b31d 100644
--- a/server/sonar-web/.gitignore
+++ b/server/sonar-web/.gitignore
@@ -20,6 +20,7 @@ yarn-error.log*
 # tests
 src/test/json/**/*.png
 lcov.info
+coverage/
 .nyc_output
 
 # eslint
diff --git a/server/sonar-web/build.gradle b/server/sonar-web/build.gradle
index 00edc7fd234..07b6127d162 100644
--- a/server/sonar-web/build.gradle
+++ b/server/sonar-web/build.gradle
@@ -6,6 +6,7 @@ sonarqube {
     property "sonar.test.inclusions", "src/main/js/**/__tests__/**"
     property "sonar.exclusions", "src/main/js/**/__tests__/**"
     property "sonar.eslint.reportPaths", "eslint-report.json"
+    property "sonar.typescript.lcov.reportPaths", "coverage/lcov.info"
   }
 }
 
diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json
index a5b00c85c96..3f7efd4aae0 100644
--- a/server/sonar-web/package.json
+++ b/server/sonar-web/package.json
@@ -138,7 +138,7 @@
     "lint-report": "eslint --ext js,ts,tsx -f json -o eslint-report.json src/main/js",
     "ts-check": "tsc --noEmit",
     "validate": "yarn lint && yarn ts-check && yarn format-check && yarn test",
-    "validate-ci": "yarn lint-report && yarn ts-check && yarn format-check && yarn test",
+    "validate-ci": "yarn lint-report && yarn ts-check && yarn format-check && yarn test --coverage",
     "precommit": "yarn ts-check && lint-staged"
   },
   "engines": {
@@ -152,10 +152,12 @@
     "IE 11"
   ],
   "jest": {
-    "coverageDirectory": "<rootDir>/target/coverage",
-    "coveragePathIgnorePatterns": [
-      "<rootDir>/node_modules",
-      "<rootDir>/tests"
+    "coverageDirectory": "<rootDir>/coverage",
+    "collectCoverageFrom": [
+      "src/main/js/**/*.{ts,tsx,js}"
+    ],
+    "coverageReporters": [
+      "lcovonly"
     ],
     "globals": {
       "ts-jest": {
@@ -185,8 +187,8 @@
       "enzyme-to-json/serializer"
     ],
     "testPathIgnorePatterns": [
+      "<rootDir>/config",
       "<rootDir>/node_modules",
-      "<rootDir>/src/main/webapp",
       "<rootDir>/scripts"
     ],
     "testRegex": "(/__tests__/.*|\\-test)\\.(ts|tsx|js)$",
-- 
2.39.5