Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-14714 c36afcdd0 -> eb6b21c00
AMBARI-22183: Fix ambari-web unit tests in branch-feature-AMBARI-14714 (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eb6b21c0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eb6b21c0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eb6b21c0 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: eb6b21c00aee12372d6badd0ebe98c680378dcb0 Parents: c36afcd Author: Jayush Luniya <[email protected]> Authored: Mon Oct 9 23:39:59 2017 -0700 Committer: Jayush Luniya <[email protected]> Committed: Mon Oct 9 23:39:59 2017 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/global/update_controller.js | 2 +- ambari-web/test/controllers/installer_test.js | 2 +- .../controllers/main/admin/kerberos/step3_controller_test.js | 2 +- ambari-web/test/controllers/main/service/add_controller_test.js | 4 ++-- ambari-web/test/controllers/wizard/step8_test.js | 2 +- ambari-web/test/mappers/service_mapper_test.js | 4 ++-- ambari-web/test/mappers/service_metrics_mapper_test.js | 4 ++-- ambari-web/test/mixins/common/configs/configs_saver_test.js | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b21c0/ambari-web/app/controllers/global/update_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js index 0758686..eee4720 100644 --- a/ambari-web/app/controllers/global/update_controller.js +++ b/ambari-web/app/controllers/global/update_controller.js @@ -537,7 +537,7 @@ App.UpdateController = Em.Controller.extend({ updateComponentsState: function (callback) { var testUrl = '/data/services/HDP2/components_state.json'; - var realUrl = '/components/?fields=ServiceComponentInfo/service_name,ServiceComponentInfo/service_display_name,' + + var realUrl = '/components/?fields=ServiceComponentInfo/service_name,ServiceComponentInfo/service_type,' + 'ServiceComponentInfo/category,ServiceComponentInfo/installed_count,ServiceComponentInfo/started_count,ServiceComponentInfo/init_count,ServiceComponentInfo/install_failed_count,ServiceComponentInfo/unknown_count,ServiceComponentInfo/total_count,ServiceComponentInfo/display_name,host_components/HostRoles/host_name&minimal_response=true'; var url = this.getUrl(testUrl, realUrl); http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b21c0/ambari-web/test/controllers/installer_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/installer_test.js b/ambari-web/test/controllers/installer_test.js index d2d4f2c..a33af65 100644 --- a/ambari-web/test/controllers/installer_test.js +++ b/ambari-web/test/controllers/installer_test.js @@ -528,7 +528,7 @@ describe('App.InstallerController', function () { }); it('should call loadStacksVersions, stack versions not loaded', function () { - installerController.loadMap['1'][1].callback.call(checker, false).then(function(data){ + installerController.loadMap['step1'][1].callback.call(checker, false).then(function(data){ expect(data).to.be.true; }); expect(checker.loadStacksVersions.calledOnce).to.be.true; http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b21c0/ambari-web/test/controllers/main/admin/kerberos/step3_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/kerberos/step3_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step3_controller_test.js index 541b9bd..dbe48d0 100644 --- a/ambari-web/test/controllers/main/admin/kerberos/step3_controller_test.js +++ b/ambari-web/test/controllers/main/admin/kerberos/step3_controller_test.js @@ -102,7 +102,7 @@ describe('App.KerberosWizardStep3Controller', function() { data: { context: Em.I18n.t('requestInfo.kerberosService'), ServiceInfo: {"state": "INSTALLED"}, - urlParams: "ServiceInfo/state=INSTALLED&ServiceInfo/service_display_name=KERBEROS" + urlParams: "ServiceInfo/state=INSTALLED&ServiceInfo/service_name=KERBEROS" }, success: 'startPolling', error: 'onTaskError' http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b21c0/ambari-web/test/controllers/main/service/add_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/service/add_controller_test.js b/ambari-web/test/controllers/main/service/add_controller_test.js index e955b4d..1119176 100644 --- a/ambari-web/test/controllers/main/service/add_controller_test.js +++ b/ambari-web/test/controllers/main/service/add_controller_test.js @@ -34,7 +34,7 @@ describe('App.AddServiceController', function() { res: { "context": Em.I18n.t('requestInfo.installServices'), "ServiceInfo": {"state": "INSTALLED"}, - "urlParams": "ServiceInfo/service_display_name.in(YARN,HBASE)" + "urlParams": "ServiceInfo/service_name.in(YARN,HBASE)" } }, { @@ -42,7 +42,7 @@ describe('App.AddServiceController', function() { res: { "context": Em.I18n.t('requestInfo.installServices'), "ServiceInfo": {"state": "INSTALLED"}, - "urlParams": "ServiceInfo/service_display_name.in(OOZIE,HDFS,YARN,MAPREDUCE2)" + "urlParams": "ServiceInfo/service_name.in(OOZIE,HDFS,YARN,MAPREDUCE2)" } }]; tests.forEach(function(t){ http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b21c0/ambari-web/test/controllers/wizard/step8_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step8_test.js b/ambari-web/test/controllers/wizard/step8_test.js index 2a52598..de43a97 100644 --- a/ambari-web/test/controllers/wizard/step8_test.js +++ b/ambari-web/test/controllers/wizard/step8_test.js @@ -1954,7 +1954,7 @@ describe('App.WizardStep8Controller', function () { describe('#_startDeploy', function () { - var stubbedNames = ['createCluster', 'createSelectedServices', 'createConfigurations', + var stubbedNames = ['createCluster', 'createServiceGroup', 'createSelectedServices', 'createConfigurations', 'applyConfigurationsToCluster', 'createComponents', 'registerHostsToCluster', 'createConfigurationGroups', 'createMasterHostComponents', 'createSlaveAndClientsHostComponents', 'createAdditionalClientComponents', 'createAdditionalHostComponents'], http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b21c0/ambari-web/test/mappers/service_mapper_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/mappers/service_mapper_test.js b/ambari-web/test/mappers/service_mapper_test.js index bfdff64..4a8d49d 100644 --- a/ambari-web/test/mappers/service_mapper_test.js +++ b/ambari-web/test/mappers/service_mapper_test.js @@ -178,7 +178,7 @@ describe('App.serviceMetricsMapper', function () { { "ServiceComponentInfo" : { "component_name" : "STORM_UI_SERVER", - "service_display_name" : "STORM" + "service_name" : "STORM" }, "metrics" : { "api" : { @@ -231,7 +231,7 @@ describe('App.serviceMetricsMapper', function () { { "ServiceComponentInfo" : { "component_name" : "STORM_REST_API", - "service_display_name" : "STORM" + "service_name" : "STORM" }, "metrics" : { "api" : { http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b21c0/ambari-web/test/mappers/service_metrics_mapper_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/mappers/service_metrics_mapper_test.js b/ambari-web/test/mappers/service_metrics_mapper_test.js index ea2c977..04dbce0 100644 --- a/ambari-web/test/mappers/service_metrics_mapper_test.js +++ b/ambari-web/test/mappers/service_metrics_mapper_test.js @@ -56,13 +56,13 @@ describe('App.serviceMetricsMapper', function () { var services = [ { ServiceInfo: { - service_display_name: "HDFS" + service_name: "HDFS" }, components: [ { ServiceComponentInfo: { component_name: "NAMENODE", - service_display_name: "HDFS" + service_name: "HDFS" }, host_components: [ { http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b21c0/ambari-web/test/mixins/common/configs/configs_saver_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/mixins/common/configs/configs_saver_test.js b/ambari-web/test/mixins/common/configs/configs_saver_test.js index ef3bab5..f20a49f 100644 --- a/ambari-web/test/mixins/common/configs/configs_saver_test.js +++ b/ambari-web/test/mixins/common/configs/configs_saver_test.js @@ -1102,7 +1102,7 @@ describe('App.ConfigsSaverMixin', function() { header: Em.I18n.t('services.service.config.saved'), message: Em.I18n.t('services.service.config.saved.message'), messageClass: 'alert alert-success', - urlParams: ',ServiceComponentInfo/installed_count,ServiceComponentInfo/total_count&ServiceComponentInfo/service_display_name.in(HDFS)' + urlParams: ',ServiceComponentInfo/installed_count,ServiceComponentInfo/total_count&ServiceComponentInfo/service_name.in(HDFS)' }); });
