Explorar o código

AMBARI-5490. Fix UI Unit tests. (onechiporenko)

Oleg Nechiporenko %!s(int64=11) %!d(string=hai) anos
pai
achega
290ec23b24

+ 3 - 2
ambari-web/test/installer/step9_test.js

@@ -27,11 +27,12 @@ var modelSetup = require('test/init_model_test');
 
 describe('App.InstallerStep9Controller', function () {
   beforeEach(function(){
-    modelSetup.setupStackServiceComponent()
+    modelSetup.setupStackServiceComponent();
   });
   afterEach(function(){
     modelSetup.cleanStackServiceComponent();
-  })
+  });
+
   describe('#isSubmitDisabled', function () {
     var tests = Em.A([
       {controllerName: 'addHostController', state: 'STARTED', e: false},

+ 8 - 1
ambari-web/test/utils/batch_scheduled_requests_test.js

@@ -19,9 +19,16 @@ var App = require('app');
 require('utils/helper');
 require('views/common/rolling_restart_view');
 var batchUtils = require('utils/batch_scheduled_requests');
-
+var modelSetup = require('test/init_model_test');
 describe('batch_scheduled_requests', function() {
 
+  beforeEach(function(){
+    modelSetup.setupStackServiceComponent();
+  });
+  afterEach(function(){
+    modelSetup.cleanStackServiceComponent();
+  });
+
   describe('#getRollingRestartComponentName', function() {
     var tests = [
       {serviceName: 'HDFS', componentName: 'DATANODE'},

+ 10 - 15
ambari-web/test/views/main/host/summary_test.js

@@ -30,9 +30,14 @@ var modelSetup = require('test/init_model_test');
 describe('App.MainHostSummaryView', function() {
 
   beforeEach(function() {
+    modelSetup.setupStackServiceComponent();
     mainHostSummaryView = extendedMainHostSummaryView.create({});
   });
 
+  afterEach(function(){
+    modelSetup.cleanStackServiceComponent();
+  });
+
   describe('#sortedComponents', function() {
 
     var tests = Em.A([
@@ -269,13 +274,6 @@ describe('App.MainHostSummaryView', function() {
 
   describe('#installableClientComponents', function() {
 
-    beforeEach(function(){
-      modelSetup.setupStackServiceComponent();
-    });
-    afterEach(function(){
-      modelSetup.cleanStackServiceComponent();
-    });
-
     it('delete host not supported', function() {
       App.set('supports.deleteHost', false);
       expect(mainHostSummaryView.get('installableClientComponents')).to.eql([]);
@@ -335,12 +333,6 @@ describe('App.MainHostSummaryView', function() {
   });
 
   describe('#addableComponents', function() {
-    beforeEach(function(){
-      modelSetup.setupStackServiceComponent();
-    });
-    afterEach(function(){
-      modelSetup.cleanStackServiceComponent();
-    });
     var tests = Em.A([
       {
         content: Em.Object.create({
@@ -392,8 +384,11 @@ describe('App.MainHostSummaryView', function() {
       it(test.m, function() {
         mainHostSummaryView.set('content', test.content);
         mainHostSummaryView.set('installedServices', test.services);
-        expect(mainHostSummaryView.get('addableComponents').mapProperty('componentName')).to.include.members(test.e);
-        expect(test.e).to.include.members(mainHostSummaryView.get('addableComponents').mapProperty('componentName'));
+        //expect(mainHostSummaryView.get('addableComponents').mapProperty('componentName')).to.include.members(test.e);
+        console.log('!!!!!!!!!', mainHostSummaryView.get('addableComponents').mapProperty('componentName').join(', '));
+        console.log('@@@@@@@@@', test.e.join(', '));
+        console.log('#########', App.get('components.addableToHost').join(', '));
+        expect(mainHostSummaryView.get('addableComponents').mapProperty('componentName')).to.eql(test.e);
       });
     });