Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AFFD8200C3A for ; Thu, 16 Mar 2017 21:01:40 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AED6B160B91; Thu, 16 Mar 2017 20:01:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E16CA160B93 for ; Thu, 16 Mar 2017 21:01:39 +0100 (CET) Received: (qmail 16733 invoked by uid 500); 16 Mar 2017 20:01:39 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 16335 invoked by uid 99); 16 Mar 2017 20:01:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Mar 2017 20:01:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B305BE9809; Thu, 16 Mar 2017 20:01:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Thu, 16 Mar 2017 20:01:43 -0000 Message-Id: <757976580930460390d02f2ad768b88d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/32] ambari git commit: AMBARI-20458 Admin/Version page doesn't mark StackAndVersion item as active (onechiporenko) archived-at: Thu, 16 Mar 2017 20:01:41 -0000 AMBARI-20458 Admin/Version page doesn't mark StackAndVersion item as active (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87d47f92 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87d47f92 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87d47f92 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 87d47f923505dd399f94c4bb97ed02c775bc0593 Parents: e34f41a Author: Oleg Nechiporenko Authored: Wed Mar 15 14:18:35 2017 +0200 Committer: Oleg Nechiporenko Committed: Wed Mar 15 14:18:35 2017 +0200 ---------------------------------------------------------------------- .../app/templates/main/side-menu-item.hbs | 2 +- ambari-web/test/views/main/menu_test.js | 52 +------------------- 2 files changed, 2 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/87d47f92/ambari-web/app/templates/main/side-menu-item.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/side-menu-item.hbs b/ambari-web/app/templates/main/side-menu-item.hbs index 44de409..38ae13d 100644 --- a/ambari-web/app/templates/main/side-menu-item.hbs +++ b/ambari-web/app/templates/main/side-menu-item.hbs @@ -35,7 +35,7 @@ http://git-wip-us.apache.org/repos/asf/ambari/blob/87d47f92/ambari-web/test/views/main/menu_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/menu_test.js b/ambari-web/test/views/main/menu_test.js index 658984c..f7dff30 100644 --- a/ambari-web/test/views/main/menu_test.js +++ b/ambari-web/test/views/main/menu_test.js @@ -24,7 +24,7 @@ describe('App.MainMenuView', function () { var view; beforeEach(function () { - view = App.MainSideMenuView.create() + view = App.MainSideMenuView.create(); }); describe("#views", function () { @@ -54,56 +54,6 @@ describe('App.MainMenuView', function () { }); }); - // todo: fix test - - //describe("#active", function () { - // - // beforeEach(function () { - // this.mock = sinon.stub(App.router, 'get'); - // }); - // - // afterEach(function () { - // this.mock.restore(); - // App.router.set('location.lastSetURL', '/login'); - // }); - // - // it("cluster not loaded", function () { - // this.mock.withArgs('clusterController.isLoaded').returns(false); - // itemViewClass.propertyDidChange('active'); - // expect(itemViewClass.get('active')).to.be.empty; - // }); - // - // it("cluster loaded, firstroute should be active", function () { - // this.mock.withArgs('clusterController.isLoaded').returns(true); - // App.router.set('location.lastSetURL', '/main/firstroute'); - // itemViewClass.propertyDidChange('active'); - // expect(itemViewClass.get('active')).to.be.equal('active'); - // }); - // - // it("cluster loaded, dashboard should be active", function () { - // itemViewClass.set('content.routing', ['dashboard']); - // this.mock.withArgs('clusterController.isLoaded').returns(true); - // App.router.set('location.lastSetURL', '/main'); - // itemViewClass.propertyDidChange('active'); - // expect(itemViewClass.get('active')).to.be.equal('active'); - // }); - // - // it("cluster loaded, should be undefined", function () { - // itemViewClass.set('content.routing', ['dashboard']); - // this.mock.withArgs('clusterController.isLoaded').returns(true); - // App.router.set('location.lastSetURL', ''); - // itemViewClass.propertyDidChange('active'); - // expect(itemViewClass.get('active')).to.be.undefined; - // }); - // - // it("cluster loaded, secondroute should not be active", function () { - // this.mock.withArgs('clusterController.isLoaded').returns(true); - // App.router.set('location.lastSetURL', '/main/secondroute'); - // itemViewClass.propertyDidChange('active'); - // expect(itemViewClass.get('active')).to.be.empty; - // }); - //}); - describe("#isViewsItem", function () { it("should be false", function() {