svn commit: r1495230 - in /incubator/ambari/trunk/ambari-web/app: assets/test/tests.js controllers/wizard.js

[yu...@apache.org]

Author: yusaku
Date: Thu Jun 20 23:09:01 2013
New Revision: 1495230

URL: http://svn.apache.org/r1495230
Log:
AMBARI-2445. Wizard and installers Unit tests. (Oleg Nechiporenko via yusaku)

Modified:
    incubator/ambari/trunk/ambari-web/app/assets/test/tests.js
    incubator/ambari/trunk/ambari-web/app/controllers/wizard.js

Modified: incubator/ambari/trunk/ambari-web/app/assets/test/tests.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/test/tests.js?rev=1495230&r1=1495229&r2=1495230&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/assets/test/tests.js (original)
+++ incubator/ambari/trunk/ambari-web/app/assets/test/tests.js Thu Jun 20 23:09:01 2013
@@ -20,11 +20,15 @@ require('test/controllers/global/backgro
 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');
\ No newline at end of file

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard.js?rev=1495230&r1=1495229&r2=1495230&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard.js Thu Jun 20 23:09:01 2013
@@ -128,7 +128,7 @@ App.WizardController = Em.Controller.ext
 
   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.ext
     } else {
       App.router.send('gotoStep' + step);
     }
+    return true;
   },
 
   gotoStep0: function () {