From f904df0f0dfd4734f978cdc3ddf5badabc067ed6 Mon Sep 17 00:00:00 2001 From: Adam Young Date: Wed, 19 Jan 2011 21:10:18 -0500 Subject: declarative defintions Delay the creation of entities until after ipa init is called made the user and group entity definitions declarative removed unused facet from groups adjusted unit tests made review changes: factories are now in an associative array entity init called right after factory init dialogs in entity init fixed type on search --- install/ui/test/navigation_tests.js | 52 +++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 22 deletions(-) (limited to 'install/ui/test/navigation_tests.js') diff --git a/install/ui/test/navigation_tests.js b/install/ui/test/navigation_tests.js index bc198ac0..916259b4 100644 --- a/install/ui/test/navigation_tests.js +++ b/install/ui/test/navigation_tests.js @@ -23,28 +23,36 @@ module('navigation'); test("Testing nav_create().", function() { - var mock_tabs_lists = - [ - { name:'identity', label:'IDENTITY', children: [ - {name:'user', entity:'user'}, - {name:'group', entity:'group'} - ]}]; - - var entity = IPA.entity({name: 'user'}); - entity.setup = function(container){ - user_mock_called = true; - same(container[0].id,'user','user id'); - same(container[0].nodeName,'DIV','user div'); - }; - IPA.add_entity(entity); - - entity = IPA.entity({name: 'group'}); - entity.setup = function(container){ - group_mock_called = true; - same(container[0].id,'group','group id'); - same(container[0].nodeName,'DIV','group Div'); - }; - IPA.add_entity(entity); + var mock_tabs_lists = [ + { name:'identity', label:'IDENTITY', children: [ + {name:'user', entity:'user'}, + {name:'group', entity:'group'} + ]}]; + + var entity; + + IPA.register_entity( function() { + var that = IPA.entity({name: 'user'}); + that.setup = function(container){ + user_mock_called = true; + same(container[0].id,'user','user id'); + same(container[0].nodeName,'DIV','user div'); + } + return that; + }); + + IPA.register_entity( function(){ + + var that = IPA.entity({name: 'group'}); + that.setup = function(container){ + group_mock_called = true; + same(container[0].id,'group','group id'); + same(container[0].nodeName,'DIV','group Div'); + }; + return that; + }); + + IPA.start_entities(); IPA.metadata = {}; var navigation = $('