You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/10/23 12:47:58 UTC
git commit: AMBARI-7852 Broken Dashboard after routing to Views.
(Ievgen Fialkovskyi via atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 0565c0769 -> 60bba553a
AMBARI-7852 Broken Dashboard after routing to Views. (Ievgen Fialkovskyi via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/60bba553
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60bba553
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60bba553
Branch: refs/heads/branch-1.7.0
Commit: 60bba553a66bc72ef8a1d7125d5f6ed1fb5314d0
Parents: 0565c07
Author: atkach <at...@hortonworks.com>
Authored: Thu Oct 23 13:47:36 2014 +0300
Committer: atkach <at...@hortonworks.com>
Committed: Thu Oct 23 13:47:36 2014 +0300
----------------------------------------------------------------------
ambari-web/app/assets/test/tests.js | 1 +
ambari-web/app/views/main/menu.js | 7 ++--
ambari-web/test/views/main/menu_test.js | 55 ++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/60bba553/ambari-web/app/assets/test/tests.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/test/tests.js b/ambari-web/app/assets/test/tests.js
index 8682af3..0b8cfe4 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -137,6 +137,7 @@ var files = ['test/init_model_test',
'test/views/common/rolling_restart_view_test',
'test/views/common/configs/config_history_flow_test',
'test/views/main/dashboard_test',
+ 'test/views/main/menu_test',
'test/views/main/dashboard/config_history_view_test',
'test/views/main/dashboard/widget_test',
'test/views/main/dashboard/widgets_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/60bba553/ambari-web/app/views/main/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/menu.js b/ambari-web/app/views/main/menu.js
index 69d0e45..89e9ac8 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -34,7 +34,7 @@ App.MainMenuView = Em.CollectionView.extend({
var result = [];
if (App.router.get('loggedIn')) {
- if (App.router.get('clusterController.isLoaded') && App.get('clusterName')) {
+ if (App.router.get('clusterController.isLoaded') && App.get('router.clusterInstallCompleted')) {
result.push(
{ label:Em.I18n.t('menu.item.dashboard'), routing:'dashboard', active:'active'},
@@ -61,8 +61,9 @@ App.MainMenuView = Em.CollectionView.extend({
}
return result;
- }.property('App.router.loggedIn', 'App.router.clusterController.isLoaded', 'App.supports.views', 'App.supports.mirroring',
- 'App.supports.secureCluster', 'App.supports.highAvailability', 'views.length'),
+ }.property('App.router.loggedIn', 'App.supports.views', 'App.supports.mirroring',
+ 'App.supports.secureCluster', 'App.supports.highAvailability', 'views.length',
+ 'App.router.clusterController.isLoaded', 'App.router.clusterInstallCompleted'),
itemViewClass:Em.View.extend({
http://git-wip-us.apache.org/repos/asf/ambari/blob/60bba553/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
new file mode 100644
index 0000000..d60bace
--- /dev/null
+++ b/ambari-web/test/views/main/menu_test.js
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+var App = require('app');
+require('views/main/menu');
+
+var mainMenuView = App.MainMenuView.create();
+describe('App.MainMenuView', function () {
+
+ describe('#content', function () {
+ var supportsMirroring;
+ beforeEach(function () {
+ supportsMirroring = Em.get('App.supports.mirroring');
+ Em.set('App.supports.mirroring', false);
+ sinon.stub(App, 'get').returns(false);
+ sinon.stub(App.router, 'get')
+ .withArgs('clusterController.isLoaded').returns(true)
+ .withArgs('loggedIn').returns(true);
+ });
+ afterEach(function () {
+ Em.set('App.supports.mirroring', supportsMirroring);
+ App.get.restore();
+ App.router.get.restore();
+ });
+
+ it('menu should be populated if cluster installation is completed', function () {
+ App.get.withArgs('router.clusterInstallCompleted').returns(true);
+ App.router.notifyPropertyChange('clusterInstallCompleted');
+ expect(mainMenuView.get('content').length > 0).to.be.true;
+ });
+
+ it('menu should not be populated if cluster installation is not completed', function () {
+ App.get.withArgs('router.clusterInstallCompleted').returns(false);
+ App.router.notifyPropertyChange('clusterInstallCompleted');
+ expect(mainMenuView.get('content').length > 0).to.be.false;
+ });
+
+ });
+});