Repository: ambari Updated Branches: refs/heads/trunk 0730247ee -> 1256d0e36
AMBARI-10702. Theme widgets should be merged from inherited theme (mpapirkovskyy via srimanth) - UI test fixes Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1256d0e3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1256d0e3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1256d0e3 Branch: refs/heads/trunk Commit: 1256d0e366f90be7219757b73acd25684b2a5b6b Parents: 0730247 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Thu Apr 23 15:41:32 2015 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Thu Apr 23 15:41:38 2015 -0700 ---------------------------------------------------------------------- .../test/mappers/configs/themes_mapper_test.js | 80 ++++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1256d0e3/ambari-web/test/mappers/configs/themes_mapper_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/mappers/configs/themes_mapper_test.js b/ambari-web/test/mappers/configs/themes_mapper_test.js index abe7751..7daaced 100644 --- a/ambari-web/test/mappers/configs/themes_mapper_test.js +++ b/ambari-web/test/mappers/configs/themes_mapper_test.js @@ -93,47 +93,47 @@ describe('App.themeMapper', function () { ] } ], + "widgets": [ + { + "config": "c1/p1", + "widget": { + "type": "slider", + "units": [ + { + "unit-name": "MB" + }, + { + "unit-name": "GB" + } + ] + } + }, + { + "config": "c1/p2", + "widget": { + "type": "slider", + "units": [ + { + "unit-name": "percent" + } + ] + } + } + ], + "placement": { + "configuration-layout": "default", + "configs": [ + { + "config": "c1/p1", + "subsection-name": "subsection1" + }, + { + "config": "c1/p2", + "subsection-name": "subsection1" + } + ] + } }, - "widgets": [ - { - "config": "c1/p1", - "widget": { - "type": "slider", - "units": [ - { - "unit-name": "MB" - }, - { - "unit-name": "GB" - } - ] - } - }, - { - "config": "c1/p2", - "widget": { - "type": "slider", - "units": [ - { - "unit-name": "percent" - } - ] - } - } - ], - "placement": { - "configuration-layout": "default", - "configs": [ - { - "config": "c1/p1", - "subsection-name": "subsection1" - }, - { - "config": "c1/p2", - "subsection-name": "subsection1" - } - ] - } } } }