浏览代码

AMBARI-2445. Wizard and installers Unit tests. (Oleg Nechiporenko via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1495230 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 12 年之前
父节点
当前提交
1abc317b02
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 5 1
      ambari-web/app/assets/test/tests.js
  2. 2 1
      ambari-web/app/controllers/wizard.js

+ 5 - 1
ambari-web/app/assets/test/tests.js

@@ -20,11 +20,15 @@ require('test/controllers/global/background_operations_test');
 require('test/controllers/global/cluster_controller_test');
 require('test/controllers/main/app_contoller_test');
 require('test/controllers/main/admin/cluster_test');
+require('test/controllers/main/admin/security/add/step2_test');
 require('test/controllers/main/admin/security/add/step3_test');
 require('test/controllers/main/charts/heatmap_metrics/heatmap_metric_test');
+require('test/controllers/main/service/reassign_controller_test');
 require('test/controllers/main/dashboard_test');
 require('test/controllers/main/host_test');
 require('test/controllers/main/item_test');
+require('test/controllers/installer_test');
+require('test/controllers/wizard_test');
 require('test/installer/step0_test');
 require('test/installer/step2_test');
 require('test/installer/step3_test');
@@ -51,6 +55,6 @@ require('test/utils/misc_test');
 require('test/utils/validator_test');
 require('test/utils/string_utils_test');
 require('test/views/common/chart/linear_time_test');
-require('test/models/host_test');
 require('test/models/host_component_test');
+require('test/models/host_test');
 require('test/models/rack_test');

+ 2 - 1
ambari-web/app/controllers/wizard.js

@@ -128,7 +128,7 @@ App.WizardController = Em.Controller.extend({
 
   gotoStep: function (step) {
     if (this.get('isStepDisabled').findProperty('step', step).get('value') !== false) {
-      return;
+      return false;
     }
     // if going back from Step 9 in Install Wizard, delete the checkpoint so that the user is not redirected
     // to Step 9
@@ -152,6 +152,7 @@ App.WizardController = Em.Controller.extend({
     } else {
       App.router.send('gotoStep' + step);
     }
+    return true;
   },
 
   gotoStep0: function () {