Repository: ambari Updated Branches: refs/heads/trunk e9e0a438a -> 0fdde6290
AMBARI-20002.UI on Admin page-> Auto Start tab is not consistent (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0fdde629 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0fdde629 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0fdde629 Branch: refs/heads/trunk Commit: 0fdde6290b3f8dd3f6009f7dc8a6e68e5a00f9df Parents: e9e0a43 Author: Oleg Nechiporenko <[email protected]> Authored: Tue Feb 14 13:02:44 2017 +0200 Committer: Oleg Nechiporenko <[email protected]> Committed: Tue Feb 14 13:02:44 2017 +0200 ---------------------------------------------------------------------- .../app/views/main/admin/service_auto_start.js | 2 +- .../main/service/info/config_test.js | 26 +++++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdde629/ambari-web/app/views/main/admin/service_auto_start.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/service_auto_start.js b/ambari-web/app/views/main/admin/service_auto_start.js index 6f7d644..0399944 100644 --- a/ambari-web/app/views/main/admin/service_auto_start.js +++ b/ambari-web/app/views/main/admin/service_auto_start.js @@ -33,7 +33,7 @@ App.MainAdminServiceAutoStartView = Em.View.extend({ this.set('isDisabled', !App.isAuthorized('CLUSTER.MANAGE_AUTO_START')); this.get('controller').load().then(() => { this.set('isLoaded', true); - Em.run.next(() => this.initSwitcher()); + Em.run.next(() => Em.run.next(() => this.initSwitcher())); }); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/0fdde629/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 8ca48b1..4cc2ef8 100644 --- a/ambari-web/test/controllers/main/service/info/config_test.js +++ b/ambari-web/test/controllers/main/service/info/config_test.js @@ -882,27 +882,31 @@ describe("App.MainServiceInfoConfigsController", function () { }); describe('#abortRequests', function() { + var pendingRequest, finishedRequest; + beforeEach(function() { mainServiceInfoConfigsController.get('requestsInProgress').clear(); - }); - it('should clear requests when abort called', function() { - mainServiceInfoConfigsController.trackRequest($.Deferred()); - mainServiceInfoConfigsController.abortRequests(); - expect(mainServiceInfoConfigsController.get('requestsInProgress')).to.have.length(0); - }); - it('should abort requests which are not finished', function() { - var pendingRequest = { + finishedRequest = { abort: sinon.spy(), - readyState: 0, + readyState: 4, state: sinon.spy(), always: sinon.spy() }; - var finishedRequest = { + pendingRequest = { abort: sinon.spy(), - readyState: 4, + readyState: 0, state: sinon.spy(), always: sinon.spy() }; + }); + + it('should clear requests when abort called', function() { + mainServiceInfoConfigsController.trackRequest($.Deferred()); + mainServiceInfoConfigsController.abortRequests(); + expect(mainServiceInfoConfigsController.get('requestsInProgress')).to.have.length(0); + }); + + it('should abort requests which are not finished', function() { mainServiceInfoConfigsController.trackRequest(pendingRequest); mainServiceInfoConfigsController.trackRequest(finishedRequest); mainServiceInfoConfigsController.abortRequests();
