diff options
author | Endi S. Dewata <edewata@redhat.com> | 2011-04-28 19:17:58 -0500 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2011-05-05 14:57:45 -0500 |
commit | a4aba826a0e1327ba8df05da19d9ad0055d8269d (patch) | |
tree | 1c2ee009a6be1c09ef19f0c4e07c60799ce344f1 /install/ui/test | |
parent | dd89c28654c92c0922900409b37c1abcefc56c84 (diff) | |
download | freeipa-a4aba826a0e1327ba8df05da19d9ad0055d8269d.tar.gz freeipa-a4aba826a0e1327ba8df05da19d9ad0055d8269d.tar.xz freeipa-a4aba826a0e1327ba8df05da19d9ad0055d8269d.zip |
Added facet container.
Facet container has been added to hold facet header (i.e. title,
search fields, buttons, links) and facet content. Each facet now
occupies separate container, so it can be shown/hidden without
having to redraw the content.
Diffstat (limited to 'install/ui/test')
-rw-r--r-- | install/ui/test/data/i18n_messages.json | 2 | ||||
-rw-r--r-- | install/ui/test/data/ipa_init.json | 2 | ||||
-rw-r--r-- | install/ui/test/details_tests.js | 35 | ||||
-rw-r--r-- | install/ui/test/entity_tests.js | 22 |
4 files changed, 33 insertions, 28 deletions
diff --git a/install/ui/test/data/i18n_messages.json b/install/ui/test/data/i18n_messages.json index cca68b945..f40cba0ed 100644 --- a/install/ui/test/data/i18n_messages.json +++ b/install/ui/test/data/i18n_messages.json @@ -37,7 +37,7 @@ "details": { "general": "General", "identity": "Identity Settings", - "settings": "${entity} Settings", + "settings": "${entity} ${primary_key} Settings", "to_top": "Back to Top" }, "dialogs": { diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 5ce4d4c8e..a5c7d951f 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -9986,7 +9986,7 @@ "details": { "general": "General", "identity": "Identity Settings", - "settings": "${entity} Settings", + "settings": "${entity} ${primary_key} Settings", "to_top": "Back to Top" }, "dialogs": { diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js index a79a194e4..2715b4eac 100644 --- a/install/ui/test/details_tests.js +++ b/install/ui/test/details_tests.js @@ -150,10 +150,6 @@ test("Testing details lifecycle: create, setup, load.", function(){ load_called = true; } - var container = details_container; - - var obj_name = 'user'; - function test_widget(){ var widget = IPA.widget({name: 'cn'}); @@ -195,35 +191,38 @@ test("Testing details lifecycle: create, setup, load.", function(){ {factory: IPA.multivalued_text_widget, name:'mobile'}, {factory: IPA.multivalued_text_widget, name:'facsimiletelephonenumber'}] - }, + } ]}).build(); entity.init(); - var facet = entity.get_facet('details'); - facet.init(); + var entity_container = $('<div/>', { + name: 'user', + title: 'User', + 'class': 'entity' + }).appendTo(entities_container); - var container = $('<div/>', { - 'class': 'content' - }).appendTo(container); + entity.create(entity_container); + var facet = entity.get_facet('details'); - entity.header = IPA.entity_header({entity:entity,container:container}); - facet.entity_header = entity.header; - entity.header.reset(); - facet.create_content(facet.entity_header.content); - facet.setup(facet.entity_header.content); + var facet_container = $('<div/>', { + name: facet.name, + 'class': 'facet' + }); + facet.create(facet_container); + facet.setup(facet_container); facet.load(result); - var contact = container.find('dl#contact.entryattrs'); + var contact = facet_container.find('dl#contact.entryattrs'); ok( contact, 'dl tag for contact is created' ); - var identity = container.find('dl#identity.entryattrs'); + var identity = facet_container.find('dl#identity.entryattrs'); ok( identity, @@ -237,7 +236,7 @@ test("Testing details lifecycle: create, setup, load.", function(){ 'Checking dt tags for identity' ); - container.attr('id','user'); + facet_container.attr('id','user'); ok ( setup_called, diff --git a/install/ui/test/entity_tests.js b/install/ui/test/entity_tests.js index 471658235..c258976f8 100644 --- a/install/ui/test/entity_tests.js +++ b/install/ui/test/entity_tests.js @@ -61,7 +61,6 @@ test('Testing IPA.entity_set_search_definition().', function() { return true; }; - var entity = IPA. entity_builder(). entity('user'). @@ -70,16 +69,23 @@ test('Testing IPA.entity_set_search_definition().', function() { build(); entity.init(); - var facet = entity.get_facet('search'); - facet.init(); + var entity_container = $('<div/>', { + name: 'user', + title: 'User', + 'class': 'entity' + }).appendTo(entities_container); - var container = $("<div/>"); + entity.create(entity_container); + + var facet = entity.get_facet('search'); - entity.header = IPA.entity_header({entity:entity,container:container}); - facet.entity_header = entity.header; - facet.create_content(facet.entity_header.content); - facet.setup(facet.entity_header.content); + var facet_container = $('<div/>', { + name: facet.name, + 'class': 'facet' + }); + facet.create(facet_container); + facet.setup(facet_container); var column = facet.get_columns()[0]; ok( |