Repository: ambari Updated Branches: refs/heads/trunk 49ecd6b2e -> 07616603c
http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js index 7c14dac..d743179 100644 --- a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js +++ b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js @@ -191,7 +191,7 @@ describe('App.ServiceConfigsByCategoryView', function () { filter: 'd', serviceConfigs: [ Em.Object.create({ - defaultValue: 'dv', + savedValue: 'dv', category: 'c', isVisible: true }) @@ -444,7 +444,7 @@ describe('App.ServiceConfigsByCategoryView', function () { category: 'c0', id: 'site property', serviceName: 's0', - defaultValue: null, + savedValue: null, supportsFinal: true, filename: 'f0', isUserProperty: true, @@ -473,7 +473,7 @@ describe('App.ServiceConfigsByCategoryView', function () { category: 'c1', id: 'site property', serviceName: 's1', - defaultValue: null, + savedValue: null, supportsFinal: false, filename: '', isUserProperty: true, @@ -513,7 +513,7 @@ describe('App.ServiceConfigsByCategoryView', function () { view.createProperty(item.propertyObj); expect(view.get('serviceConfigs').filterProperty('name', item.propertyObj.name)).to.have.length(1); expect(view.get('serviceConfigs').findProperty('name', item.propertyObj.name).getProperties([ - 'name', 'displayName', 'value', 'displayType', 'isSecureConfig', 'category', 'id', 'serviceName', 'defaultValue', + 'name', 'displayName', 'value', 'displayType', 'isSecureConfig', 'category', 'id', 'serviceName', 'savedValue', 'supportsFinal', 'filename', 'isUserProperty', 'isNotSaved', 'isRequired', 'group', 'isOverridable' ])).to.eql(item.result); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js b/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js index 3e301d6..63e8f25 100644 --- a/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js +++ b/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js @@ -29,7 +29,7 @@ describe('App.ListConfigWidgetView', function () { _validateOverrides: App.ServiceConfigProperty.prototype._validateOverrides, validate: App.ServiceConfigProperty.prototype.validate, name: 'a.b.c', - defaultValue: '2,1', + savedValue: '2,1', value: '2,1', filename: 'f1', isFinal: false, @@ -152,7 +152,7 @@ describe('App.ListConfigWidgetView', function () { view.restoreDependentConfigs.restore(); view.get('controller.removeCurrentFromDependentList').restore(); }); - it('should restore default value', function () { + it('should restore saved value', function () { view.toggleOption({context: view.get('options')[0]}); view.toggleOption({context: view.get('options')[1]}); view.toggleOption({context: view.get('options')[2]}); http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js b/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js index fba4493..ce42aba 100644 --- a/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js +++ b/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js @@ -35,7 +35,7 @@ describe('App.SliderConfigWidgetView', function () { name: 'a.b.c', description: 'A B C', value: '486', - defaultValue: '486', + savedValue: '486', stackConfigProperty: Em.Object.create({ valueAttributes: Em.Object.create({ type: 'int', @@ -65,7 +65,7 @@ describe('App.SliderConfigWidgetView', function () { name: 'a.b.c2', description: 'A B C 2', value: '72.2', - defaultValue: '72.2', + savedValue: '72.2', stackConfigProperty: Em.Object.create({ valueAttributes: Em.Object.create({ type: 'float', @@ -94,7 +94,7 @@ describe('App.SliderConfigWidgetView', function () { name: 'a.b.c3', description: 'A B C 3', value: '0.22', - defaultValue: '0.22', + savedValue: '0.22', stackConfigProperty: Em.Object.create({ valueAttributes: Em.Object.create({ type: 'float', http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/test/views/common/configs/widgets/toggle_config_widget_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/common/configs/widgets/toggle_config_widget_view_test.js b/ambari-web/test/views/common/configs/widgets/toggle_config_widget_view_test.js index 76e0330..9204620 100644 --- a/ambari-web/test/views/common/configs/widgets/toggle_config_widget_view_test.js +++ b/ambari-web/test/views/common/configs/widgets/toggle_config_widget_view_test.js @@ -28,7 +28,7 @@ describe('App.ToggleConfigWidgetView', function () { config: Em.Object.create({ name: 'a.b.c', value: 'active', - defaultValue: 'active', + savedValue: 'active', stackConfigProperty: Em.Object.create({ valueAttributes: { "type": "value-list", http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/test/views/common/controls_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/common/controls_view_test.js b/ambari-web/test/views/common/controls_view_test.js index 463edb9..f673871 100644 --- a/ambari-web/test/views/common/controls_view_test.js +++ b/ambari-web/test/views/common/controls_view_test.js @@ -613,14 +613,14 @@ describe('App.ServiceConfigRadioButtons', function () { databaseName: item.databaseName, hostName: item.hostName, databaseNameProperty: Em.Object.create({ - defaultValue: item.databaseNameDefault + recommendedValue: item.databaseNameDefault }), hostNameProperty: Em.Object.create({ - defaultValue: item.hostNameDefault + recommendedValue: item.hostNameDefault }) }); expect(view.get('connectionUrl.value')).to.equal(item.connectionUrlValue); - expect(view.get('connectionUrl.defaultValue')).to.equal(item.connectionUrlDefaultValue); + expect(view.get('connectionUrl.recommendedValue')).to.equal(item.connectionUrlDefaultValue); expect(view.get('dbClass.value')).to.equal(item.dbClassValue); serviceAuthPropsMap[item.serviceName].forEach(function (propName) { expect(view.get('categoryConfigsAll').findProperty('name', propName).get('isVisible')).to.equal(item.isAuthVisibleAndRequired); @@ -789,7 +789,7 @@ describe('App.BaseUrlTextField', function () { it('should be recalculated after value is changed', function () { view.setProperties({ value: 'val', - defaultValue: 'val' + recommendedValue: 'val' }); expect(view.get('valueWasChanged')).to.be.false; view.set('value', 'newVal'); @@ -803,7 +803,7 @@ describe('App.BaseUrlTextField', function () { it('should unset value', function () { view.setProperties({ value: 'valNew', - defaultValue: 'val' + savedValue: 'val' }); view.restoreValue(); expect(view.get('value')).to.equal('val');
