You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2016/04/25 11:43:00 UTC
ambari git commit: AMBARI-16015 Popup for selecting Hive Interactive
host does not work after re-enabling the Interactive Query toggle.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk b2ef85bf7 -> 8a20810b2
AMBARI-16015 Popup for selecting Hive Interactive host does not work after re-enabling the Interactive Query toggle. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a20810b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a20810b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a20810b
Branch: refs/heads/trunk
Commit: 8a20810b208e02b32a77045a7f3b68eb88575b5f
Parents: b2ef85b
Author: ababiichuk <ab...@hortonworks.com>
Authored: Mon Apr 25 12:14:11 2016 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Mon Apr 25 12:14:11 2016 +0300
----------------------------------------------------------------------
.../app/controllers/wizard/step7/assign_master_controller.js | 1 +
.../controllers/wizard/step7/assign_master_controller_test.js | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a20810b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index d68fa8e..410e42b 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -241,6 +241,7 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin, App
saveMasterComponentHosts: function() {
var controller = App.router.get(this.get('content.controllerName'));
controller.saveMasterComponentHosts(this);
+ controller.loadMasterComponentHosts();
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a20810b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
index 0bc1c05..27fb7be 100644
--- a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
+++ b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
@@ -318,6 +318,7 @@ describe('App.AssignMasterOnStep7Controller', function () {
},
mock = {
saveMasterComponentHosts: Em.K,
+ loadMasterComponentHosts: Em.K,
setDBProperty: Em.K
},
config = Em.Object.create({
@@ -329,6 +330,7 @@ describe('App.AssignMasterOnStep7Controller', function () {
sinon.stub(popup, 'hide');
sinon.stub(App.router, 'get').returns(mock);
sinon.stub(mock, 'saveMasterComponentHosts');
+ sinon.stub(mock, 'loadMasterComponentHosts');
sinon.stub(mock, 'setDBProperty');
view.reopen({
content: Em.Object.create({
@@ -373,6 +375,7 @@ describe('App.AssignMasterOnStep7Controller', function () {
App.router.get.restore();
popup.hide.restore();
mock.saveMasterComponentHosts.restore();
+ mock.loadMasterComponentHosts.restore();
mock.setDBProperty.restore();
});
@@ -380,6 +383,10 @@ describe('App.AssignMasterOnStep7Controller', function () {
expect(mock.saveMasterComponentHosts.calledOnce).to.be.true;
});
+ it("saveMasterComponentHosts should be called", function() {
+ expect(mock.loadMasterComponentHosts.calledOnce).to.be.true;
+ });
+
it("configActionComponent should be set", function() {
expect(view.get('configWidgetContext.config.configActionComponent')).to.be.eql({
componentName: 'C1',