This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 35fbf98b50 Revert "AMBARI-25985 Remove PhantomJs headless browser.
(#3760)"
35fbf98b50 is described below
commit 35fbf98b501c0aa535e07a7b243092bbad4969ae
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Sun Mar 10 00:35:54 2024 -0800
Revert "AMBARI-25985 Remove PhantomJs headless browser. (#3760)"
This reverts commit 48de4b94d3b4751858a3770cc79779e0b53e0cff.
---
ambari-admin/src/main/resources/ui/admin-web/package.json | 2 ++
.../src/main/resources/ui/admin-web/test/karma.conf.js | 4 ++--
ambari-web/karma.conf.js | 7 +++----
ambari-web/package.json | 2 --
.../main/service/manage_config_groups_controller_test.js | 12 ++++++------
ambari-web/test/controllers/main_test.js | 4 ----
ambari-web/test/router_test.js | 2 +-
.../test/views/main/admin/stack_upgrade/version_view_test.js | 6 +++---
8 files changed, 17 insertions(+), 22 deletions(-)
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 bc427c9333..d9995ac023 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -24,6 +24,8 @@
"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",
"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 e7f5d9d32a..bb514cd473 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
@@ -44,11 +44,11 @@ module.exports = function(config){
frameworks: ['jasmine'],
- browsers: ['ChromeHeadless'],
+ browsers: ['PhantomJS'],
plugins : [
'karma-jasmine',
- 'karma-chrome-launcher',
+ 'karma-phantomjs-launcher',
'karma-ng-html2js-preprocessor'
],
diff --git a/ambari-web/karma.conf.js b/ambari-web/karma.conf.js
index 0a23833565..b19287f779 100644
--- a/ambari-web/karma.conf.js
+++ b/ambari-web/karma.conf.js
@@ -23,15 +23,14 @@ module.exports = function(config) {
basePath: '',
plugins: [
+ 'karma-phantomjs-launcher',
'karma-mocha',
'karma-chai',
'karma-sinon',
'karma-coverage',
'karma-ember-precompiler-brunch',
'karma-commonjs-require',
- 'karma-babel-preprocessor',
- 'karma-chrome-launcher',
- 'karma-verbose-reporter'
+ 'karma-babel-preprocessor'
],
// frameworks to use
@@ -168,7 +167,7 @@ module.exports = function(config) {
// - Opera (has to be installed with `npm install karma-opera-launcher`)
// - Safari (only Mac; has to be installed with `npm install
karma-safari-launcher`)
// - IE (only Windows; has to be installed with `npm install
karma-ie-launcher`)
- browsers: ['ChromeHeadless'],
+ browsers: ['PhantomJS'],
// If browser does not capture in given timeout [ms], kill it
captureTimeout: 60000,
diff --git a/ambari-web/package.json b/ambari-web/package.json
index aea2df5410..7fcc59dc82 100644
--- a/ambari-web/package.json
+++ b/ambari-web/package.json
@@ -30,13 +30,11 @@
"karma-phantomjs-launcher": "1.0.2",
"karma-babel-preprocessor": "^6.0.1",
"karma-chai": "~0.1.0",
- "karma-chrome-launcher":"^3.2.0",
"karma-commonjs-require": "~0.0.3",
"karma-coverage": "~0.2.0",
"karma-ember-precompiler-brunch": "^1.0.0",
"karma-mocha": "0.1.1",
"karma-sinon": "~1.0.2",
- "karma-verbose-reporter":"^0.0.8",
"mocha": "2.5.3",
"phantomjs": "~2.1.0",
"sinon": "=1.7.3",
diff --git
a/ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js
b/ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js
index 6a53fa0f96..db3151ebec 100644
---
a/ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js
+++
b/ambari-web/test/controllers/main/service/manage_config_groups_controller_test.js
@@ -511,7 +511,6 @@ describe('App.ManageConfigGroupsController', function() {
c._onLoadPropertiesSuccess(data, null, params);
expect(JSON.stringify(c.get('configGroups'))).to.equal(JSON.stringify([
Em.Object.create({
- name: 'group1',
properties: [
{
name: 'prop1',
@@ -524,9 +523,9 @@ describe('App.ManageConfigGroupsController', function() {
type: 'type1'
}
],
+ name: 'group1'
}),
Em.Object.create({
- name: 'group2',
properties: [
{
name: 'prop3',
@@ -534,9 +533,9 @@ describe('App.ManageConfigGroupsController', function() {
type: 'type1'
}
],
+ name: 'group2'
}),
Em.Object.create({
- name: 'group3',
properties: [
{
name: 'prop4',
@@ -544,10 +543,11 @@ describe('App.ManageConfigGroupsController', function() {
type: 'type2'
}
],
+ name: 'group3'
}),
Em.Object.create({
- name: 'group4',
- properties: []
+ properties: [],
+ name: 'group4'
})
]));
});
@@ -675,4 +675,4 @@ describe('App.ManageConfigGroupsController', function() {
});
});
-});
\ No newline at end of file
+});
diff --git a/ambari-web/test/controllers/main_test.js
b/ambari-web/test/controllers/main_test.js
index 465f06d8cd..b833c459cd 100644
--- a/ambari-web/test/controllers/main_test.js
+++ b/ambari-web/test/controllers/main_test.js
@@ -18,10 +18,6 @@
var App = require('app');
-beforeEach(()=>{
- window.onbeforeunload=()=>console.log("Page reloaded");
-})
-
describe('App.MainController', function () {
var mainController = App.MainController.create();
diff --git a/ambari-web/test/router_test.js b/ambari-web/test/router_test.js
index 2d55a5b183..c177bbf749 100644
--- a/ambari-web/test/router_test.js
+++ b/ambari-web/test/router_test.js
@@ -86,7 +86,7 @@ describe('App.Router', function () {
});
- describe.skip('#adminViewInfoSuccessCallback', function () {
+ describe('#adminViewInfoSuccessCallback', function () {
beforeEach(function () {
sinon.stub(window.location, 'replace', Em.K);
});
diff --git
a/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js
b/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js
index 0ef3d4bd57..b274c32fb3 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js
@@ -360,7 +360,7 @@ describe('App.mainAdminStackVersionsView', function () {
});
});
- describe.skip("#selectCategory()", function() {
+ describe("#selectCategory()", function() {
var event;
beforeEach(function () {
sinon.stub(view, 'filterVersions');
@@ -454,7 +454,7 @@ describe('App.mainAdminStackVersionsView', function () {
});
});
- describe.skip("#goToVersions()", function() {
+ describe("#goToVersions()", function() {
var data = {
components: [{
'RootServiceComponents': {
@@ -498,7 +498,7 @@ describe('App.mainAdminStackVersionsView', function () {
});
});
- describe.skip("#goToVersionsCustomVersions", function() {
+ describe("#goToVersionsCustomVersions", function() {
var data = {
components: [{
'RootServiceComponents': {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
