summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwaynedunican <wayne.dunican@est.tech>2020-08-24 13:36:15 +0100
committerPamela Dragosh <pdragosh@research.att.com>2020-08-25 09:35:52 -0400
commit0bdca95bb07cd2e9f896ba2e9fce6522b785940e (patch)
tree2f32ac2c8cc7ef656fe4098e0d656d4d6dc7c462
parent34d6d486318bf7922ff6c5e0897370f5b4e60395 (diff)
Jest JS Coverage
Edited SonarCloud lcov reports path. Removed from pdp-monitoring pom.xml. Added node binary source executable path and sources sonar properties to pom.xml. Issue-ID: POLICY-2610 Change-Id: I6354e65d358ca5e9bd8c18f032330aa5063a0889 Signed-off-by: waynedunican <wayne.dunican@est.tech> Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--gui-editors/pom.xml5
-rw-r--r--gui-pdp-monitoring/pom.xml8
-rw-r--r--gui-pdp-monitoring/src/webapp/package.json4
-rw-r--r--pom.xml3
4 files changed, 16 insertions, 4 deletions
diff --git a/gui-editors/pom.xml b/gui-editors/pom.xml
index 9ef52cc..e772a04 100644
--- a/gui-editors/pom.xml
+++ b/gui-editors/pom.xml
@@ -32,6 +32,11 @@
<name>${project.artifactId}</name>
<description>Web Client editors for PDP policies</description>
+ <properties>
+ <sonar.sources>${project.basedir}/src/main</sonar.sources>
+ <sonar.exclusions>src/main/resources/webapp/js/edit_area/**/*,src/main/resources/webapp/js/jquery/**/*,src/main/resources/webapp/js/jquery-ui-1.12.1/**/*,src/main/resources/webapp/js/lib/**/*</sonar.exclusions>
+ </properties>
+
<modules>
<module>gui-editor-apex</module>
</modules>
diff --git a/gui-pdp-monitoring/pom.xml b/gui-pdp-monitoring/pom.xml
index 0f8743c..17b008f 100644
--- a/gui-pdp-monitoring/pom.xml
+++ b/gui-pdp-monitoring/pom.xml
@@ -32,7 +32,9 @@
<properties>
<webapp.dir>src/webapp</webapp.dir>
- <sonar.javascript.lcov.reportPaths>src/webapp/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
+ <sonar.nodejs.executable>${project.basedir}/src/webapp/node/node</sonar.nodejs.executable>
+ <sonar.sources>${project.basedir}/src/main,${project.basedir}/src/webapp/js</sonar.sources>
+ <sonar.exclusions>src/webapp/js/__test__/**</sonar.exclusions>
</properties>
<dependencies>
@@ -104,12 +106,16 @@
<goals>
<goal>npm</goal>
</goals>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
</execution>
<execution>
<id>npm test</id>
<goals>
<goal>npm</goal>
</goals>
+ <phase>test</phase>
<configuration>
<arguments>test</arguments>
</configuration>
diff --git a/gui-pdp-monitoring/src/webapp/package.json b/gui-pdp-monitoring/src/webapp/package.json
index 793d6ba..88389ca 100644
--- a/gui-pdp-monitoring/src/webapp/package.json
+++ b/gui-pdp-monitoring/src/webapp/package.json
@@ -26,14 +26,14 @@
},
"jest": {
"collectCoverage": true,
- "coverageDirectory": "../../../target/code-coverage",
+ "coverageDirectory": "../../target/code-coverage",
"transform": {
"^.+\\.[t|j]sx?$": "babel-jest"
},
"testResultsProcessor": "jest-sonar-reporter"
},
"jestSonar": {
- "reportPath": "../../../target/reports",
+ "reportPath": "../../target/reports",
"reportFile": "test-reporter.xml",
"indent": 4,
"sonar56x": true
diff --git a/pom.xml b/pom.xml
index 1f2ce46..81e8336 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,8 @@
<properties>
<policy.common.version>1.7.1-SNAPSHOT</policy.common.version>
<policy.models.version>2.3.1-SNAPSHOT</policy.models.version>
- <sonar.javascript.lcov.reportPaths>target/code-coverage/lcov.info</sonar.javascript.lcov.reportPaths>
+ <jacoco.dataFile>${project.basedir}/../../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
+ <sonar.javascript.lcov.reportPaths>${project.basedir}/target/code-coverage/lcov.info</sonar.javascript.lcov.reportPaths>
</properties>
<modules>