diff options
Diffstat (limited to 'portal-FE-os')
| -rw-r--r-- | portal-FE-os/package.json | 4 | ||||
| -rw-r--r-- | portal-FE-os/pom.xml | 3 | ||||
| -rw-r--r-- | portal-FE-os/src/karma.conf.js | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/portal-FE-os/package.json b/portal-FE-os/package.json index 77cef690..4371bc4d 100644 --- a/portal-FE-os/package.json +++ b/portal-FE-os/package.json @@ -61,11 +61,13 @@ "jasmine-core": "~2.99.1", "jasmine-spec-reporter": "~4.2.1", "karma": "~3.0.0", - "karma-chrome-launcher": "~2.2.0", + "karma-chrome-launcher": "^2.2.0", "karma-coverage-istanbul-reporter": "~2.0.1", "karma-jasmine": "~1.1.2", "karma-jasmine-html-reporter": "^0.2.2", + "karma-phantomjs-launcher": "^1.0.4", "protractor": "~5.4.0", + "puppeteer": "^2.1.1", "sonar-scanner": "^3.1.0", "ts-node": "~7.0.0", "tslint": "~5.11.0", diff --git a/portal-FE-os/pom.xml b/portal-FE-os/pom.xml index 21bdd508..fd497e17 100644 --- a/portal-FE-os/pom.xml +++ b/portal-FE-os/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.portal</groupId> <artifactId>portal-FE-os</artifactId> - <version>3.1.0</version> + <version>3.2.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -18,6 +18,7 @@ <sonar.test.inclusions>**/*.spec.ts</sonar.test.inclusions> <sonar.tests>src</sonar.tests> <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding> + <sonar.nodejs.executable>${project.basedir}\node\</sonar.nodejs.executable> </properties> <build> diff --git a/portal-FE-os/src/karma.conf.js b/portal-FE-os/src/karma.conf.js index b6e00421..154ad588 100644 --- a/portal-FE-os/src/karma.conf.js +++ b/portal-FE-os/src/karma.conf.js @@ -1,6 +1,7 @@ // Karma configuration file, see link for more information // https://karma-runner.github.io/1.0/config/configuration-file.html +process.env.CHROME_BIN = require('puppeteer').executablePath() module.exports = function (config) { config.set({ basePath: '', @@ -10,6 +11,7 @@ module.exports = function (config) { require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage-istanbul-reporter'), + require('karma-phantomjs-launcher'), require('@angular-devkit/build-angular/plugins/karma') ], client: { @@ -25,7 +27,7 @@ module.exports = function (config) { colors: true, logLevel: config.LOG_INFO, autoWatch: true, - browsers: ['Chrome'], + browsers: ['ChromeHeadless'], singleRun: false }); };
\ No newline at end of file |