From e1277b4c1f8eec902f5919e8173c5d2b9a2efc2c Mon Sep 17 00:00:00 2001 From: zRains <2296342883@qq.com> Date: Tue, 13 Aug 2024 09:22:30 +0000 Subject: [PATCH] feat(ambari-admin): switch to chromium-browser --- ambari-admin/pom.xml | 4 ++-- .../main/resources/ui/admin-web/package.json | 4 +--- .../resources/ui/admin-web/test/karma.conf.js | 19 +++++++++++++++++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml index c88eb5e641d..d0c1bef4a59 100644 --- a/ambari-admin/pom.xml +++ b/ambari-admin/pom.xml @@ -135,7 +135,7 @@ ${args.shell} ${basedir}${dirsep}set-ambari-version.${fileextension.shell} ${ambariVersion} - + diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json b/ambari-admin/src/main/resources/ui/admin-web/package.json index d9995ac0239..a3b442c2b13 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/package.json +++ b/ambari-admin/src/main/resources/ui/admin-web/package.json @@ -21,11 +21,9 @@ "http-server": "0.6.1", "jasmine-core": "^3.1.0", "karma": "^2.0.4", - "karma-chrome-launcher": "0.1.4", "karma-jasmine": "^1.1.2", "karma-ng-html2js-preprocessor": "^1.0.0", - "karma-phantomjs-launcher": "^1.0.4", - "phantomjs": "^2.1.7", + "karma-chrome-launcher": "3.2.0", "protractor": "1.0.0" }, "scripts": { diff --git a/ambari-admin/src/main/resources/ui/admin-web/test/karma.conf.js b/ambari-admin/src/main/resources/ui/admin-web/test/karma.conf.js index bb514cd473f..fb6353e3b15 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/test/karma.conf.js +++ b/ambari-admin/src/main/resources/ui/admin-web/test/karma.conf.js @@ -42,13 +42,28 @@ module.exports = function(config){ autoWatch : true, + colors: true, + + logLevel: config.LOG_INFO, + + captureTimeout: 60000, + + browserNoActivityTimeout: 30000, + frameworks: ['jasmine'], - browsers: ['PhantomJS'], + customLaunchers: { + ChromeHeadlessCustom: { + base: 'ChromeHeadless', + flags: ['--no-sandbox', '--disable-gpu', '--disable-translate', '--disable-extensions'] + } + }, + + browsers: ['ChromeHeadlessCustom'], plugins : [ 'karma-jasmine', - 'karma-phantomjs-launcher', + 'karma-chrome-launcher', 'karma-ng-html2js-preprocessor' ],