Repository: ambari Updated Branches: refs/heads/trunk 1527bd15c -> bca0346b9
AMBARI-19182. Config Groups: Save button not enabled while trying to overwrite configs (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bca0346b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bca0346b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bca0346b Branch: refs/heads/trunk Commit: bca0346b9f3eb01cd90e00cfce366305fca7a38b Parents: 1527bd1 Author: Oleg Nechiporenko <[email protected]> Authored: Thu Jan 5 15:44:17 2017 +0200 Committer: Oleg Nechiporenko <[email protected]> Committed: Thu Jan 5 15:44:17 2017 +0200 ---------------------------------------------------------------------- .../models/configs/objects/service_config.js | 1 + .../journalNode/step4_controller_test.js | 2 +- .../resourceManager/step3_controller_test.js | 22 +++----------------- ambari-web/test/utils/config_test.js | 10 ++++++--- 4 files changed, 12 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bca0346b/ambari-web/app/models/configs/objects/service_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/objects/service_config.js b/ambari-web/app/models/configs/objects/service_config.js index 7d07467..ea24ec4 100644 --- a/ambari-web/app/models/configs/objects/service_config.js +++ b/ambari-web/app/models/configs/objects/service_config.js @@ -158,6 +158,7 @@ App.ServiceConfig = Ember.Object.extend({ this._super(); this.set('dependentServiceNames', App.StackService.find(this.get('serviceName')).get('dependentServiceNames') || []); this.observeForeignKeys(); + this.setActiveProperties(); }, hasConfigIssues: Em.computed.someBy('activeProperties', 'hasIssues', true) http://git-wip-us.apache.org/repos/asf/ambari/blob/bca0346b/ambari-web/test/controllers/main/admin/highAvailability/journalNode/step4_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/highAvailability/journalNode/step4_controller_test.js b/ambari-web/test/controllers/main/admin/highAvailability/journalNode/step4_controller_test.js index ba92b54..0c0ef5c 100644 --- a/ambari-web/test/controllers/main/admin/highAvailability/journalNode/step4_controller_test.js +++ b/ambari-web/test/controllers/main/admin/highAvailability/journalNode/step4_controller_test.js @@ -45,7 +45,7 @@ describe('App.ManageJournalNodeWizardStep4Controller', function () { host_name: 'host1' }); controller.stopStandbyNameNode(); - expect(controller.updateComponent.calledWith('NAMENODE', 'host1', 'HDFS', 'INSTALLED')).to.be.true; + expect(controller.updateComponent.calledWith('NAMENODE', 'host1', 'HDFS', 'INSTALLED')).to.be.true; }); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/bca0346b/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js b/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js index 665d8e6..004c5ad 100644 --- a/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js +++ b/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js @@ -374,19 +374,13 @@ describe('App.RMHighAvailabilityWizardStep3Controller', function () { }); describe("#renderConfigs()", function () { - var serviceConfig = App.ServiceConfig.create({ - serviceName: 'MISC', - displayName: 'MISC', - configCategories: [], - showConfig: true, - configs: [] - }); beforeEach(function() { sinon.stub(controller, 'renderConfigProperties'); sinon.stub(App.Service, 'find').returns([Em.Object.create({ serviceName: 'S1' })]); + controller.renderConfigs(); }); afterEach(function() { @@ -395,22 +389,12 @@ describe('App.RMHighAvailabilityWizardStep3Controller', function () { }); it("renderConfigProperties should be called", function() { - controller.renderConfigs(); - expect(controller.renderConfigProperties.getCall(0).args[1]).to.be.eql(serviceConfig); + expect(controller.renderConfigProperties.getCall(0).args[1]).to.be.an('object').and.have.property('serviceName').equal('MISC'); }); it("App.ajax.send should be called", function() { - controller.renderConfigs(); var args = testHelpers.findAjaxRequest('name', 'config.tags'); - expect(args[0]).to.be.eql({ - name: 'config.tags', - sender: controller, - success: 'loadConfigTagsSuccessCallback', - error: 'loadConfigsErrorCallback', - data: { - serviceConfig: serviceConfig - } - }); + expect(args[0].data.serviceConfig).to.be.an('object').and.have.property('serviceName').equal('MISC'); }); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/bca0346b/ambari-web/test/utils/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js index 7c2515a..bb3a308 100644 --- a/ambari-web/test/utils/config_test.js +++ b/ambari-web/test/utils/config_test.js @@ -1493,7 +1493,7 @@ describe('App.config', function() { var predefined = Em.Object.create({ serviceName: 'serviceName1', displayName: 'displayName1', - configCategories: 'configCategories1' + configCategories: [{name: 'configCategories1'}] }); var configs = [Em.Object.create({name: 'c1'})]; @@ -1516,7 +1516,6 @@ describe('App.config', function() { var res = { serviceName: 'serviceName1', displayName: 'displayName1', - configCategories: 'configCategories1', configs: configs, configGroups: configGroups, initConfigsLength: 1, @@ -1527,13 +1526,15 @@ describe('App.config', function() { expect(App.config.createServiceConfig('serviceName1', configGroups, configs, 1).get(k)).to.eql(res[k]); }); }); + it('configCategories', function () { + expect(App.config.createServiceConfig('serviceName1', configGroups, configs, 1).get('configCategories').mapProperty('name')).to.eql(['configCategories1']); + }); }); describe('create default service config object', function () { var res = { serviceName: 'serviceName1', displayName: 'displayName1', - configCategories: 'configCategories1', configGroups: [], initConfigsLength: 0, dependentServiceNames: [] @@ -1543,6 +1544,9 @@ describe('App.config', function() { expect(App.config.createServiceConfig('serviceName1').get(k)).to.eql(res[k]); }); }); + it('configCategories', function () { + expect(App.config.createServiceConfig('serviceName1', configGroups, configs, 1).get('configCategories').mapProperty('name')).to.eql(['configCategories1']); + }); }); });
