You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/04/02 14:54:00 UTC

git commit: AMBARI-5314. Ambari Web unit tests don't run due to an error. (onechiporenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk 25b4eb51c -> 7910b44a1


AMBARI-5314. Ambari Web unit tests don't run due to an error. (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7910b44a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7910b44a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7910b44a

Branch: refs/heads/trunk
Commit: 7910b44a161dfaf84f109f3373f3bdddccdd0cb7
Parents: 25b4eb5
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Wed Apr 2 15:51:17 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Apr 2 15:51:17 2014 +0300

----------------------------------------------------------------------
 .../security/add/addSecurity_controller_test.js   |  1 +
 ambari-web/test/installer/step6_test.js           | 18 +++---------------
 2 files changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7910b44a/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js b/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js
index f266efc..2996579 100644
--- a/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js
@@ -18,6 +18,7 @@
 
 
 var App = require('app');
+require('models/host');
 require('controllers/wizard');
 require('controllers/main/admin/security/add/addSecurity_controller');
 require('models/host_component');

http://git-wip-us.apache.org/repos/asf/ambari/blob/7910b44a/ambari-web/test/installer/step6_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/installer/step6_test.js b/ambari-web/test/installer/step6_test.js
index 8bba557..e323f2d 100644
--- a/ambari-web/test/installer/step6_test.js
+++ b/ambari-web/test/installer/step6_test.js
@@ -47,7 +47,7 @@ describe('App.WizardStep6Controller', function () {
     ]
   });
 
-  var HOSTS = [ 'host0', 'host1', 'host2', 'host3' ];
+  var HOSTS = Em.A([ 'host0', 'host1', 'host2', 'host3' ]);
 
   var h = {};
   var m = [];
@@ -110,21 +110,9 @@ describe('App.WizardStep6Controller', function () {
     });
   });
 
-  describe('#hasMasterComponents', function() {
-    HOSTS.forEach(function(host) {
-      it('Host ' + host + ' is master', function() {
-        expect(controller.hasMasterComponents(host)).to.equal(true);
-      });
-    });
-    var notMasterHost = 'NotMasterHost';
-    it('Host ' + notMasterHost + ' is not master', function() {
-      expect(controller.hasMasterComponents(notMasterHost)).to.equal(false);
-    });
-  });
-
   describe('#setAllNodes', function() {
 
-    var test_config = [
+    var test_config = Em.A([
       {
         title: 'DataNode',
         name: 'DATANODE',
@@ -145,7 +133,7 @@ describe('App.WizardStep6Controller', function () {
         name: 'TASKTRACKER',
         state: true
       }
-    ];
+    ]);
 
     test_config.forEach(function(test) {
       it((test.state?'Select':'Deselect') + ' all ' + test.title, function() {