From ca8202c6824e8ed305444c04e4ab516e66d79c1e Mon Sep 17 00:00:00 2001
From: klu909 <55161078+klu909@users.noreply.github.com>
Date: Thu, 3 Dec 2020 13:28:02 -0800
Subject: [PATCH] fix(2288): fix sonarqube setting (#106)

---
 mocha.config.json | 6 ++++++
 package.json      | 6 ++++--
 screwdriver.yaml  | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 mocha.config.json

diff --git a/mocha.config.json b/mocha.config.json
new file mode 100644
index 0000000..1857191
--- /dev/null
+++ b/mocha.config.json
@@ -0,0 +1,6 @@
+{
+    "reporterEnabled": "spec, mocha-sonarqube-reporter",
+    "mochaSonarqubeReporterReporterOptions": {
+        "output": "./artifacts/report/test.xml"
+    }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index b5082b0..33b3803 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "pretest": "eslint .",
-    "test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --recursive --timeout 4000 --retries 1 --exit --allow-uncaught true --color true",
+    "test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 4000 --retries 1 --exit --allow-uncaught true --color true",
     "start": "./bin/server",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post",
     "debug": "node --nolazy ./bin/server"
@@ -53,7 +53,9 @@
     "eslint-config-screwdriver": "^3.0.0",
     "js-yaml": "^3.6.1",
     "jsonwebtoken": "^8.4.0",
-    "mocha": "^7.2.0",
+    "mocha": "^8.2.1",
+    "mocha-multi-reporters": "^1.5.1",
+    "mocha-sonarqube-reporter": "^1.0.2",
     "mockery": "^2.0.0",
     "nyc": "^15.0.0",
     "sinon": "^7.0.0"
diff --git a/screwdriver.yaml b/screwdriver.yaml
index 2f6bdd7..19f19d1 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -4,7 +4,7 @@ shared:
 jobs:
     main:
         environment:
-            SD_SONAR_OPTS: "-Dsonar.sources=lib,plugins,helpers -Dsonar.javascript.lcov.reportPath=artifacts/coverage/lcov.info"
+            SD_SONAR_OPTS: "-Dsonar.sources=lib,plugins,helpers -Dsonar.tests=test -Dsonar.javascript.lcov.reportPaths=artifacts/coverage/lcov.info -Dsonar.testExecutionReportPaths=artifacts/report/test.xml"
         requires: [~pr, ~commit]
         steps:
             - install: npm install