diff options
author | Endi S. Dewata <edewata@redhat.com> | 2011-08-10 20:03:02 -0500 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2011-09-09 19:47:05 +0000 |
commit | 26ded75be94e60a34a19d06ce4a5fb3185875cd5 (patch) | |
tree | 498efdb8de69d26b37963b301090ca92877e93a2 /install/ui/test | |
parent | 806a40846b8848ffe2f23e216949d7a8babc5c79 (diff) | |
download | freeipa-26ded75be94e60a34a19d06ce4a5fb3185875cd5.tar.gz freeipa-26ded75be94e60a34a19d06ce4a5fb3185875cd5.tar.xz freeipa-26ded75be94e60a34a19d06ce4a5fb3185875cd5.zip |
Fixed layout problem in permission adder dialog.
In order to maintain consistent layout between details page and dialog
boxes the IPA.details_list_section has been replaced with
IPA.details_table_section which is based on table.
The IPA.target_section and other subclasses of IPA.details_list_section
have been converted to use IPA.details_table_section as well.
The unit tests have been updated accordingly.
Ticket #1648
Diffstat (limited to 'install/ui/test')
-rw-r--r-- | install/ui/test/data/permission_show_targetgroup.json | 10 | ||||
-rw-r--r-- | install/ui/test/details_tests.js | 106 |
2 files changed, 59 insertions, 57 deletions
diff --git a/install/ui/test/data/permission_show_targetgroup.json b/install/ui/test/data/permission_show_targetgroup.json index 0a140c201..cfe49b938 100644 --- a/install/ui/test/data/permission_show_targetgroup.json +++ b/install/ui/test/data/permission_show_targetgroup.json @@ -5,16 +5,24 @@ "result": { "attributelevelrights": { "aci": "rscwo", + "attrs": "rscwo", "businesscategory": "rscwo", "cn": "rscwo", "description": "rscwo", + "filter": "rscwo", + "group": "rscwo", + "ipapermissiontype": "rscwo", "member": "rscwo", "nsaccountlock": "rscwo", "o": "rscwo", "objectclass": "rscwo", "ou": "rscwo", "owner": "rscwo", - "seealso": "rscwo" + "permissions": "rscwo", + "seealso": "rscwo", + "subtree": "rscwo", + "targetgroup": "rscwo", + "type": "rscwo" }, "cn": [ "targetgroup" diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js index e06ddc23c..122234e78 100644 --- a/install/ui/test/details_tests.js +++ b/install/ui/test/details_tests.js @@ -58,7 +58,7 @@ module('details', { test("Testing IPA.details_section.create().", function() { - var section = IPA.details_list_section({ + var section = IPA.details_table_section({ entity: IPA.get_entity('user'), name:'IDIDID', label:'NAMENAMENAME'}). text({name:'cn'}). @@ -71,45 +71,38 @@ test("Testing IPA.details_section.create().", function() { var container = $("<div/>"); section.create(container); - var dl = $('dl', container); + var table = $('table', container); same( - dl.length, 1, - 'Checking dl tag' + table.length, 1, + 'Verifying table' ); + var rows = $('tr', table); same( - dl.attr('id'), section.name, - 'Checking section name' - ); - - var dts = $('dt', dl); - same( - dts.length, fields.length, // each field generates dt & dd - 'Checking number of children' + rows.length, fields.length, + 'Verifying table rows' ); for (var i=0; i<fields.length; i++) { var field = fields[i]; - var dt = dts.get(i); + var field_label = $('.field-label[name='+field.name+']', container); same( - dt.innerHTML, field.label+':', - 'Checking field '+field.name+'\'s label' + field_label.text(), field.label+':', + 'Verifying label for field '+field.name ); - var field_container = $('.details-field[name='+field.name+']', dl); + var field_container = $('.field[name='+field.name+']', container); ok( field_container.length, - 'Checking container tag for field '+field.name + 'Verifying container for field '+field.name ); - var dd = $('dd', field_container); - ok( - dd.length == 0, - 'Checking dd tag for field '+field.name + field_container.hasClass('widget'), + 'Verifying field '+field.name+' was created' ); } }); @@ -210,25 +203,25 @@ test("Testing details lifecycle: create, load.", function(){ facet.load(result); - var contact = facet_container.find('dl#contact.entryattrs'); + var contact = $('.details-section[name=contact]', facet_container); ok( - contact, - 'dl tag for contact is created' + contact.length, + 'Verifying section for contact is created' ); - var identity = facet_container.find('dl#identity.entryattrs'); + var identity = $('.details-section[name=identity]', facet_container); ok( - identity, - 'dl tag for identity is created' + identity.length, + 'Verifying section for identity is created' ); - var dts = identity.find('dt'); + var rows = $('tr', identity); same( - dts.length, 6, - 'Checking dt tags for identity' + rows.length, 6, + 'Verifying rows for identity' ); facet_container.attr('id','user'); @@ -253,8 +246,8 @@ test("Testing details lifecycle: create, load.", function(){ test("Testing IPA.details_section_create again()",function(){ - var section = IPA.details_list_section({ - name: 'IDIDID', label: 'NAMENAMENAME',entity: IPA.get_entity('user'),}). + var section = IPA.details_table_section({ + name: 'IDIDID', label: 'NAMENAMENAME',entity: IPA.get_entity('user')}). text({name:'cn', label:'Entity Name'}). text({name:'description', label:'Description'}). text({name:'number', label:'Entity ID'}); @@ -268,37 +261,38 @@ test("Testing IPA.details_section_create again()",function(){ section.create(container); section.load(result); - var dl = $('dl', container); - ok( - dl.length, - 'dl is created' - ); + var table = $('table', container); same( - dl[0].id, section.name, - 'checking section name' + table.length, 1, + 'Verifying table' ); - var dt = $('dt', dl); + var rows = $('tr', table); same( - dt.length, 3, - '3 dt' + rows.length, fields.length, + 'Verifying table rows' ); - same( - dt[0].innerHTML, fields[0].label+":", - 'inner HTML matches label' - ); + for (var i=0; i<fields.length; i++) { + var field = fields[i]; - var dd = $('dd', dl); - same( - dd.length, 3, - '3 dd' - ); + var field_label = $('.field-label[name='+field.name+']', container); + same( + field_label.text(), field.label+':', + 'Verifying label for field '+field.name + ); - var field_container = $('.details-field[name="cn"]', dd[0]); - same( - field_container.length, 1, - '1 field container' - ); + var field_container = $('.field[name='+field.name+']', container); + + ok( + field_container.length, + 'Verifying container for field '+field.name + ); + + ok( + field_container.hasClass('widget'), + 'Verifying field '+field.name+' was created' + ); + } }); |