AMBARI-13532. RU: Upgrade window does not show 'Upgrade Finished' status on completion.(xiwang)

ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js

@@ -196,10 +196,12 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
   requestStatus: function () {
     if (this.get('isSuspended')) {
       return 'SUSPENDED';
+    } else if (this.get('upgradeData.Upgrade')){
+      return this.get('upgradeData.Upgrade.request_status');
     } else {
-      return App.get('upgradeState');
+      return '';
     }
-  }.property('isSuspended', 'App.upgradeState'),
+  }.property('isSuspended', 'upgradeData.Upgrade.request_status'),
 
   init: function () {
     this.initDBProperties();

ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js

@@ -183,7 +183,7 @@ App.upgradeWizardView = Em.View.extend({
    */
   upgradeStatusLabel: function() {
     var labelKey = null;
-    switch (App.get('upgradeState')) {
+    switch (this.get('controller.upgradeData.Upgrade.request_status')) {
       case 'QUEUED':
       case 'PENDING':
       case 'IN_PROGRESS':
@@ -213,7 +213,7 @@ App.upgradeWizardView = Em.View.extend({
     } else {
       return "";
     }
-  }.property('App.upgradeState', 'controller.isDowngrade', 'controller.isSuspended'),
+  }.property('controller.upgradeData.Upgrade.request_status', 'controller.isDowngrade', 'controller.isSuspended'),
 
   /**
    * toggle details box

ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js

@@ -75,14 +75,14 @@ describe('App.MainAdminStackAndUpgradeController', function() {
 
   describe("#requestStatus", function() {
     it("isSuspended false", function() {
-      App.set('upgradeState', 'ABORTED');
       controller.set('isSuspended', false);
+      controller.set('upgradeData', { Upgrade: {request_status: 'ABORTED'}});
       controller.propertyDidChange('requestStatus');
       expect(controller.get('requestStatus')).to.equal('ABORTED');
     });
     it("isSuspended true", function() {
-      App.set('upgradeState', 'ABORTED');
       controller.set('isSuspended', true);
+      controller.set('upgradeData', { Upgrade: {request_status: 'ABORTED'}});
       controller.propertyDidChange('requestStatus');
       expect(controller.get('requestStatus')).to.equal('SUSPENDED');
     });

ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js

@@ -448,12 +448,6 @@ describe('App.upgradeWizardView', function () {
   });
 
   describe("#upgradeStatusLabel", function () {
-    beforeEach(function () {
-      this.mock = sinon.stub(App, 'get');
-    });
-    afterEach(function () {
-      this.mock.restore();
-    });
     var testCases = [
       {
         data: {
@@ -614,7 +608,7 @@ describe('App.upgradeWizardView', function () {
         it('status = ' + test.data.status + ", isDowngrade = " + test.data.isDowngrade, function () {
           view.set('controller.isDowngrade', test.data.isDowngrade);
           view.set('controller.isSuspended', test.data.isSuspended);
-          this.mock.returns(test.data.status);
+          view.set('controller.upgradeData.Upgrade.request_status', test.data.status);
           view.propertyDidChange('upgradeStatusLabel');
           expect(view.get('upgradeStatusLabel')).to.equal(test.result);
         });