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 12:14:43 -0500 |
commit | dd89c28654c92c0922900409b37c1abcefc56c84 (patch) | |
tree | cf6d1d5eedcce59a0cd1fd263c3fe9a7a435b36b /install/ui/test/navigation_tests.js | |
parent | 5eb9f088f2c5c902a55aefdf9dd8b2a95e060837 (diff) | |
download | freeipa-dd89c28654c92c0922900409b37c1abcefc56c84.tar.gz freeipa-dd89c28654c92c0922900409b37c1abcefc56c84.tar.xz freeipa-dd89c28654c92c0922900409b37c1abcefc56c84.zip |
Moved entity contents outside navigation.
Previously the entities and navigation are entangled inside a common
DOM structure which limits code reuse. Now they have been moved
into separate structures.
Diffstat (limited to 'install/ui/test/navigation_tests.js')
-rw-r--r-- | install/ui/test/navigation_tests.js | 63 |
1 files changed, 42 insertions, 21 deletions
diff --git a/install/ui/test/navigation_tests.js b/install/ui/test/navigation_tests.js index e88c99d94..0f8f1be4a 100644 --- a/install/ui/test/navigation_tests.js +++ b/install/ui/test/navigation_tests.js @@ -43,8 +43,8 @@ test("Testing IPA.navigation.create().", function() { metadata:IPA.metadata.objects.user}); that.setup = function(container){ user_mock_called = true; - same(container[0].id,'user','user id'); - same(container[0].nodeName,'DIV','user div'); + same(container.attr('name'), 'user', 'user container name'); + same(container[0].nodeName, 'DIV', 'user container element'); }; return that; }; @@ -53,8 +53,8 @@ test("Testing IPA.navigation.create().", function() { metadata:IPA.metadata.objects.group}); that.setup = function(container){ group_mock_called = true; - same(container[0].id,'group','group id'); - same(container[0].nodeName,'DIV','group Div'); + same(container.attr('name'), 'group','user container name'); + same(container[0].nodeName, 'DIV', 'user container element'); }; return that; }; @@ -62,12 +62,14 @@ test("Testing IPA.navigation.create().", function() { IPA.start_entities(); IPA.metadata = {}; - var container = $('<div id="navigation"/>').appendTo(document.body); + var navigation_container = $('<div id="navigation"/>').appendTo(document.body); + var entity_container = $('<div id="content"/>').appendTo(document.body); var user_mock_called = false; var group_mock_called = false; var navigation = IPA.navigation({ - container: container, + container: navigation_container, + content: entity_container, tabs: [ { name:'identity', label:'IDENTITY', children: [ {name:'user', entity:'user'}, @@ -81,19 +83,34 @@ test("Testing IPA.navigation.create().", function() { ok(user_mock_called, "mock user setup was called"); ok(!group_mock_called, "mock group setup was not called because the tab is inactive"); - same( container[0].children.length, 2, "Two Child tabs"); - same( container[0].children[1].id, 'identity', "Identity Tab"); - same( container[0].children[1].children[1].id, 'user', "User Tab"); - same( container[0].children[1].children[2].id, 'group', "User Tab"); - container.remove(); + + var level1_tabs = navigation_container.children('div'); + same(level1_tabs.length, 1, "One level 1 tab"); + + var identity_tab = level1_tabs.first(); + same(identity_tab.attr('name'), 'identity', "Identity Tab"); + + var level2_tabs = identity_tab.children('div'); + same(level2_tabs.length, 2, "Two level 2 tabs"); + + var user_tab = level2_tabs.first(); + same(user_tab.attr('name'), 'user', "User Tab"); + + var group_tab = user_tab.next(); + same(group_tab.attr('name'), 'group', "Group Tab"); + + entity_container.remove(); + navigation_container.remove(); }); test("Testing IPA.navigation.update() with valid index.", function() { - var container = $('<div id="navigation"/>').appendTo(document.body); + var navigation_container = $('<div id="navigation"/>').appendTo(document.body); + var entity_container = $('<div id="content"/>').appendTo(document.body); var navigation = IPA.navigation({ - container: container, + container: navigation_container, + content: entity_container, tabs: [ { name:'identity', label:'IDENTITY', children: [ {name:'one', label:'One', setup: function (){}}, @@ -121,26 +138,29 @@ test("Testing IPA.navigation.update() with valid index.", function() { navigation.update(); same( - container.tabs('option', 'selected'), 0, + navigation_container.tabs('option', 'selected'), 0, "Active tab at level 1" ); same( - $('#identity').tabs('option', 'selected'), 1, + $('.tabs[name=identity]', navigation_container).tabs('option', 'selected'), 1, "Active tab at level 2" ); navigation.remove_state("identity"); - container.remove(); + entity_container.remove(); + navigation_container.remove(); }); test("Testing IPA.navigation.update() with out-of-range index.", function() { - var container = $('<div id="navigation"/>').appendTo(document.body); + var navigation_container = $('<div id="navigation"/>').appendTo(document.body); + var entity_container = $('<div id="content"/>').appendTo(document.body); var navigation = IPA.navigation({ - container: container, + container: navigation_container, + content: entity_container, tabs: [ { name:'identity', label:'IDENTITY', children: [ {name:'one', label:'One', setup: function (){}}, @@ -168,16 +188,17 @@ test("Testing IPA.navigation.update() with out-of-range index.", function() { navigation.update(); same( - container.tabs('option', 'selected'), 0, + navigation_container.tabs('option', 'selected'), 0, "Active tab at level 1" ); same( - $('#identity').tabs('option', 'selected'), 0, + $('.tabs[name=identity]', navigation_container).tabs('option', 'selected'), 0, "Active tab at level 2" ); navigation.remove_state("identity"); - container.remove(); + entity_container.remove(); + navigation_container.remove(); }); |