aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-ui/package.json14
-rw-r--r--catalog-ui/pom.xml20
-rw-r--r--catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.spec.ts2
-rw-r--r--catalog-ui/src/tsconfig.json6
-rw-r--r--pom.xml7
5 files changed, 33 insertions, 16 deletions
diff --git a/catalog-ui/package.json b/catalog-ui/package.json
index 1625802dce..fc99b356dc 100644
--- a/catalog-ui/package.json
+++ b/catalog-ui/package.json
@@ -12,11 +12,11 @@
"designer": "npm start -- --env.role designer",
"admin": "npm start -- --env.role admin",
"start": "webpack-dev-server",
- "build": "npm run test && webpack --config webpack.config.js",
- "build:prod": "npm run test && webpack --config webpack.production.js",
+ "build": "webpack --config webpack.config.js",
+ "build:prod": "webpack --config webpack.production.js",
"lint": "ng lint",
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet",
- "test": "jest",
+ "test": "jest --coverage",
"test:watch": "jest --watch",
"cypress": "cypress run",
"cypress-headless": "start-server-and-test start http-get://localhost:9000 cypress"
@@ -24,11 +24,15 @@
"jest": {
"preset": "jest-preset-angular",
"collectCoverageFrom": [
- "src/app/ng2/pages/composition/**/*.ts"
+ "<rootDir>/src/app/ng2/**/*.ts"
+ ],
+ "coverageDirectory": "<rootDir>/target/code-coverage/",
+ "coverageReporters": [
+ "lcov"
],
"setupTestFrameworkScriptFile": "<rootDir>/src/jest/setup-jest.ts",
"transformIgnorePatterns": [
- "node_modules/(?!onap-ui-angular)"
+ "<rootDir>/node_modules/(?!onap-ui-angular)"
],
"verbose": true,
"roots": [
diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index f08fb64276..f8d4e3f70c 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -13,6 +13,11 @@
<version>1.7.0-SNAPSHOT</version>
</parent>
+ <properties>
+ <sonar.nodejs.executable>${project.basedir}/node/node</sonar.nodejs.executable>
+ <sonar.sources>src/app/ng2</sonar.sources>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -26,7 +31,6 @@
<goal>clean</goal>
</goals>
<configuration>
-
<filesets>
<fileset>
<directory>${project.parent.basedir}/catalog-fe/src/main/webapp</directory>
@@ -72,7 +76,7 @@
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<configuration>
- <installDirectory>${project.parent.basedir}</installDirectory>
+ <installDirectory>${project.basedir}</installDirectory>
</configuration>
<executions>
@@ -118,6 +122,18 @@
<arguments>run build:prod</arguments>
</configuration>
</execution>
+
+ <execution>
+ <id>npm_test</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>test</phase>
+ <configuration>
+ <arguments>test</arguments>
+ <skip>${skipTests}</skip>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.spec.ts b/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.spec.ts
index 3a660c1de7..7234c120e8 100644
--- a/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.spec.ts
+++ b/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.spec.ts
@@ -23,7 +23,7 @@ describe('palette component', () => {
providers: [CompositionPaletteService,
{provide: HttpClient, useValue: httpServiceMock},
{provide: SdcConfigToken, useValue: sdcConfigToken},
- {provide: WorkspaceService, useValue{}}
+ {provide: WorkspaceService, useValue: {}}
]
});
diff --git a/catalog-ui/src/tsconfig.json b/catalog-ui/src/tsconfig.json
index 81d527b763..af1d58ce1a 100644
--- a/catalog-ui/src/tsconfig.json
+++ b/catalog-ui/src/tsconfig.json
@@ -5,7 +5,6 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"allowJs": true,
- "mapRoot": "./",
"module": "commonjs",
"moduleResolution": "node",
"outDir": "../dist/out-tsc",
@@ -13,11 +12,6 @@
"es6",
"dom"
],
- "paths": {
- "@angular/*": [
- "../node_modules/@angular/*"
- ]
- },
"sourceMap": true,
"target": "es5",
"typeRoots": [
diff --git a/pom.xml b/pom.xml
index 5fe1cb5b8d..1a8c9b857e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,13 +131,16 @@ Modifications copyright (c) 2018-2019 Nokia
<sdc-tosca-parser.version>1.6.5</sdc-tosca-parser.version>
<!-- sonar -->
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>
+ <sonar.nodejs.executable>${project.basedir}/node/node</sonar.nodejs.executable>
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+ <sonar.javascript.lcov.reportPaths>${project.build.directory}/code-coverage/lcov.info</sonar.javascript.lcov.reportPaths>
<sonar.coverage.jacoco.xmlReportPaths>
${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
<sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
- <sonar.branch>${project.version}</sonar.branch>
-
+ <sonar.coverage.exclusions>pom.xml,src/test</sonar.coverage.exclusions>
<!--cassandra -->
<cassandra.driver.version>3.6.0</cassandra.driver.version>
<libthrift.version>0.12.0</libthrift.version>