ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject ambari git commit: AMBARI-15317 proxyuser properties are recommended but not added on add service.(ababiichuk)
Date Mon, 07 Mar 2016 15:14:16 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b4fe1b660 -> 074a7a52a


AMBARI-15317 proxyuser properties are recommended but not added on add service.(ababiichuk)


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

Branch: refs/heads/trunk
Commit: 074a7a52ab8c0422cd9f426b360c5bb2efd916c6
Parents: b4fe1b6
Author: ababiichuk <ababiichuk@hortonworks.com>
Authored: Mon Mar 7 16:55:05 2016 +0200
Committer: ababiichuk <ababiichuk@hortonworks.com>
Committed: Mon Mar 7 16:55:05 2016 +0200

----------------------------------------------------------------------
 .../mixins/common/configs/config_recommendation_parser.js    | 2 +-
 .../common/configs/config_recommendation_parser_test.js      | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/074a7a52/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 826ce19..6b37563 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -168,7 +168,7 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations,
{
     App.assertExists(serviceName, 'serviceName');
 
     var coreObject = this._getCoreProperties(serviceName, recommendedValue, this._getInitialFromRecommendations(name,
fileName)),
-      newConfig = App.config.getDefaultConfig(name, serviceName, fileName, coreObject),
+      newConfig = App.config.getDefaultConfig(name, fileName, coreObject),
       addedPropertyObject = App.ServiceConfigProperty.create(newConfig);
 
     addedPropertyObject.validate();

http://git-wip-us.apache.org/repos/asf/ambari/blob/074a7a52/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js b/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
index 35f84cd..14d4973 100644
--- a/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
+++ b/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
@@ -263,10 +263,9 @@ describe('App.ConfigRecommendationParser', function() {
         'initialValue': 'initialValue',
         'savedValue': null
       });
-      sinon.stub(App.config, 'getDefaultConfig', function(name, serviceName, fileName, coreObject)
{
+      sinon.stub(App.config, 'getDefaultConfig', function(name, fileName, coreObject) {
         coreObject.name = name;
         coreObject.filename = fileName;
-        coreObject.serviceName = serviceName;
         return coreObject;
       });
     });
@@ -277,14 +276,13 @@ describe('App.ConfigRecommendationParser', function() {
     });
     
     it('adds new config', function() {
-      expect(instanceObject._createNewProperty('name', 'fileName', 'serviceName', 'recommendedValue',
null)).to.eql(App.ServiceConfigProperty.create({
+      expect(instanceObject._createNewProperty('name', 'fileName', 'recommendedValue', null)).to.eql(App.ServiceConfigProperty.create({
         'value': 'recommendedValue',
         'recommendedValue': 'recommendedValue',
         'initialValue': 'initialValue',
         'savedValue': null,
         'name': 'name',
-        'filename': 'fileName',
-        'serviceName': 'serviceName'
+        'filename': 'fileName'
       }));
 
       expect(instanceObject.applyRecommendation.calledOnce).to.be.true;


Mime
View raw message