ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject ambari git commit: AMBARI-17498 "% of cluster capacity" continues to show as visible when we DISCARD the the calculated LLAp configs after HSI enabled. (atkach)
Date Thu, 30 Jun 2016 12:56:15 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk f8257e587 -> ce8e87616


AMBARI-17498 "% of cluster capacity" continues to show as visible when we DISCARD the the
calculated LLAp configs after HSI enabled. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce8e8761
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce8e8761
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce8e8761

Branch: refs/heads/trunk
Commit: ce8e876169ea325a98192b71f5eafe1dc1de7ddb
Parents: f8257e5
Author: Andrii Tkach <atkach@apache.org>
Authored: Thu Jun 30 14:50:00 2016 +0300
Committer: Andrii Tkach <atkach@apache.org>
Committed: Thu Jun 30 15:55:36 2016 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/info/configs.js      | 1 +
 ambari-web/test/controllers/main/service/info/config_test.js | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ce8e8761/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index e1afd5e..bc91b72 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -635,6 +635,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.AddSecurityConfi
   doCancel: function () {
     this.set('preSelectedConfigVersion', null);
     this.clearAllRecommendations();
+    this.clearRecommendationsInfo();
     this.loadSelectedVersion(this.get('selectedVersion'), this.get('selectedConfigGroup'));
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/ce8e8761/ambari-web/test/controllers/main/service/info/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/service/info/config_test.js b/ambari-web/test/controllers/main/service/info/config_test.js
index b533054..1c8cbfd 100644
--- a/ambari-web/test/controllers/main/service/info/config_test.js
+++ b/ambari-web/test/controllers/main/service/info/config_test.js
@@ -406,9 +406,11 @@ describe("App.MainServiceInfoConfigsController", function () {
   describe("#doCancel", function () {
     beforeEach(function () {
       sinon.stub(Em.run, 'once', Em.K);
+      sinon.stub(mainServiceInfoConfigsController, 'clearRecommendationsInfo');
     });
     afterEach(function () {
       Em.run.once.restore();
+      mainServiceInfoConfigsController.clearRecommendationsInfo.restore();
     });
 
     it("should clear dependent configs", function() {
@@ -416,6 +418,7 @@ describe("App.MainServiceInfoConfigsController", function () {
       mainServiceInfoConfigsController.set('recommendations', Em.A([{name: 'prop_1'}]));
       mainServiceInfoConfigsController.doCancel();
       expect(App.isEmptyObject(mainServiceInfoConfigsController.get('recommendations'))).to.be.true;
+      expect(mainServiceInfoConfigsController.clearRecommendationsInfo.calledOnce).to.be.true;
     });
   });
 


Mime
View raw message