Repository: ambari Updated Branches: refs/heads/branch-2.6 3a1c3a6e4 -> 5fd168a5f
AMBARI-21992. Update Already Installed Icon Appears On Old Repo (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5fd168a5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5fd168a5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5fd168a5 Branch: refs/heads/branch-2.6 Commit: 5fd168a5fc0cab49820a4d394ea3b24c4c7a0422 Parents: 3a1c3a6 Author: Alex Antonenko <[email protected]> Authored: Tue Sep 19 16:16:09 2017 +0300 Committer: Alex Antonenko <[email protected]> Committed: Tue Sep 19 16:16:09 2017 +0300 ---------------------------------------------------------------------- .../upgrade_version_column_view.js | 2 +- .../upgrade_version_column_view_test.js | 47 ++++++++++++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd168a5/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js index ff74eb4..d19b437 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js @@ -70,7 +70,7 @@ App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({ * @returns {boolean} */ getNotUpgradable: function(isAvailable, isUpgradable) { - return !this.get('content.isStandard') && this.get('content.status') !== 'CURRENT' && isAvailable && !isUpgradable; + return this.get('content.isMaint') && this.get('content.status') !== 'CURRENT' && isAvailable && !isUpgradable; }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd168a5/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js index 1c68fa3..50c267d 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js @@ -88,6 +88,7 @@ describe('App.UpgradeVersionColumnView', function () { stackVersionType: 'HCP', isCompatible: true, hidden: false, + isMaint: false, stackServices: [ Em.Object.create({ name: 'zk', @@ -102,11 +103,32 @@ describe('App.UpgradeVersionColumnView', function () { isAvailable: true }) ] - }) + }), + Em.Object.create({ + id: 4, + status: "INSTALLED", + repositoryVersion: "2.0.2.1", + stackVersionType: 'HCP', + isCompatible: true, + hidden: false, + isMaint: true, + stackServices: [ + Em.Object.create({ + name: 'zk', + isAvailable: true + }), + Em.Object.create({ + name: 'storm', + isAvailable: false + }), + Em.Object.create({ + name: 'hdfs', + isAvailable: true + }) + ] + }), ]; - - describe("#isStackServiceAvailable", function () { beforeEach(function() { sinon.stub(App.Service, 'find', function (id) { @@ -143,4 +165,23 @@ describe('App.UpgradeVersionColumnView', function () { expect(view.isStackServiceAvailable(versions[1].get('stackServices')[1])).to.be.true; }); }); + + describe("#getNotUpgradable", function () { + it ('Should return false for not maint', function () { + view.set('content', versions[2]); + expect(view.getNotUpgradable(true, false)).to.be.false; + }); + it ('Should return true for maint, when service is available and not upgradable', function () { + view.set('content', versions[3]); + expect(view.getNotUpgradable(true, false)).to.be.true; + }); + it ('Should return false for maint, when service is available and upgradable', function () { + view.set('content', versions[3]); + expect(view.getNotUpgradable(true, true)).to.be.false; + }); + it ('Should return false for maint, when service is not available and upgradable', function () { + view.set('content', versions[3]); + expect(view.getNotUpgradable(false, true)).to.be.false; + }) + }) });
