Просмотр исходного кода

AMBARI-15350. Typo in the dependent key (onechiporenko)

Oleg Nechiporenko 9 лет назад
Родитель
Сommit
0c44129ad1

+ 1 - 1
ambari-web/app/controllers/main/service/info/configs.js

@@ -53,7 +53,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
     return this.get('groupsStore').filter(function(group) {
       return this.get('dependentServiceNames').contains(group.get('serviceName'));
     }, this);
-  }.property('content.serviceName', 'dependentServiceNames', 'groupsStore.length', 'groupStore.@each.name'),
+  }.property('content.serviceName', 'dependentServiceNames', 'groupsStore.length', 'groupsStore.@each.name'),
 
   allConfigs: [],
 

+ 4 - 7
ambari-web/test/controllers/main/service/widgets/create/wizard_controller_test.js

@@ -36,16 +36,13 @@ describe('App.WidgetWizardController', function () {
   describe("#substitueQueueMetrics", function () {
     beforeEach(function () {
       controller = App.WidgetWizardController.create();
-      sinon.stub(App.YARNService, 'find', function (k) {
-        if ('YARN' === k) {
-          return Em.Object.create({
-            'allQueueNames': ["root", "root/queue1", "root/queue1/queue2", "root/queue1/queue3"]
-          });
-        }
+      sinon.stub(App.YARNService, 'find', function () {
+        return Em.Object.create({
+          'allQueueNames': ["root", "root/queue1", "root/queue1/queue2", "root/queue1/queue3"]
+        });
       });
     });
     afterEach(function () {
-      controller = '';
       App.YARNService.find.restore();
     });
 

+ 7 - 13
ambari-web/test/controllers/main_test.js

@@ -144,19 +144,13 @@ describe('App.MainController', function () {
 
   describe('#updateTitle', function() {
     beforeEach(function () {
-      sinon.stub(App.router, 'get', function(message){
-        if (message === 'clusterController.clusterName') {
-          return 'c1';
-        } else if (message === 'clusterInstallCompleted') {
-          return true;
-        } else if (message === 'clusterController') {
-          return {
-            get: function() {
-              return true;
-            }
-          };
-        }
-      });
+      sinon.stub(App.router, 'get').withArgs('clusterController.clusterName').returns('c1')
+        .withArgs('clusterInstallCompleted').returns(true)
+        .withArgs('clusterController').returns({
+          get: function() {
+            return true;
+          }
+        });
     });
     afterEach(function () {
       App.router.get.restore();