diff options
author | Adam Young <ayoung@redhat.com> | 2011-01-19 21:10:18 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2011-01-27 16:46:44 -0500 |
commit | f904df0f0dfd4734f978cdc3ddf5badabc067ed6 (patch) | |
tree | a9da10718ae2982b0f8721cdf7df4bad05532f93 /install/ui/test | |
parent | 442d6ad30ce1156914e6245aa7502499e50ec0da (diff) | |
download | freeipa-f904df0f0dfd4734f978cdc3ddf5badabc067ed6.tar.gz freeipa-f904df0f0dfd4734f978cdc3ddf5badabc067ed6.tar.xz freeipa-f904df0f0dfd4734f978cdc3ddf5badabc067ed6.zip |
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
Diffstat (limited to 'install/ui/test')
-rw-r--r-- | install/ui/test/details_tests.js | 17 | ||||
-rw-r--r-- | install/ui/test/entity_tests.js | 35 | ||||
-rw-r--r-- | install/ui/test/navigation_tests.js | 52 |
3 files changed, 69 insertions, 35 deletions
diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js index d832bd26..38609072 100644 --- a/install/ui/test/details_tests.js +++ b/install/ui/test/details_tests.js @@ -19,7 +19,19 @@ */ -module('details'); +module('details', { + setup: function() { + var obj_name = 'user'; + IPA.register_entity( + function(){ + return IPA.entity({name:obj_name}); + }); + IPA.start_entities(); + }, + teardown: function() { + } +}); + test("Testing IPA.details_section.create().", function() { @@ -146,7 +158,10 @@ test("Testing details lifecycle: create, setup, load.", function(){ } var container = $("<div/>"); + var obj_name = 'user'; + + IPA.entity_set_details_definition(obj_name, [ IPA.stanza({name:'identity', label:'Identity Details'}). input({name:'title'}). diff --git a/install/ui/test/entity_tests.js b/install/ui/test/entity_tests.js index 21fff48f..a5878a6c 100644 --- a/install/ui/test/entity_tests.js +++ b/install/ui/test/entity_tests.js @@ -18,7 +18,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -module('entity'); +module('entity',{ + setup: function() { + IPA.register_entity(function(){return IPA.entity({name:'user'})}); + IPA.start_entities(); + }, + teardown: function() { + } +}); test('Testing IPA.entity_set_search_definition().', function() { @@ -79,19 +86,25 @@ test('Testing ipa_facet_setup_views().', function() { } ); - var entity = IPA.entity({ - 'name': 'user' - }); - IPA.add_entity(entity); + IPA.register_entity(function(){ + var entity = IPA.entity({ + 'name': 'user' + }); - var facet = IPA.search_facet({ - 'name': 'search', - 'label': 'Search' + return entity; }); - entity.add_facet(facet); - entity.create_association_facets(); + IPA.start_entities(); + + var entity = IPA.get_entity('user'); + var facet = IPA.search_facet({ + 'name': 'search', + 'label': 'Search' + }); + entity.add_facet(facet); + entity.create_association_facets(); + var container = $('<div/>'); @@ -167,5 +180,3 @@ test('Testing ipa_facet_setup_views().', function() { IPA.switch_and_show_page = orig_switch_and_show_page; }); - - 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 = $('<div id="navigation"/>').appendTo(document.body); |