From 0b0e77cf99b38cfd958a82caad715511c91f9ee3 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Wed, 2 Jul 2014 15:09:22 +0200 Subject: webui: new navigation structure https://fedorahosted.org/freeipa/ticket/4418 Reviewed-By: Fraser Tweedale Reviewed-By: Martin Kosek Reviewed-By: Petr Spacek --- ipatests/test_webui/test_automember.py | 2 +- ipatests/test_webui/test_dns.py | 2 +- ipatests/test_webui/test_navigation.py | 63 +++++++++++++++++++++------------- ipatests/test_webui/ui_driver.py | 2 +- 4 files changed, 43 insertions(+), 26 deletions(-) (limited to 'ipatests/test_webui') diff --git a/ipatests/test_webui/test_automember.py b/ipatests/test_webui/test_automember.py index 3166fbd29..34710cb6e 100644 --- a/ipatests/test_webui/test_automember.py +++ b/ipatests/test_webui/test_automember.py @@ -72,7 +72,7 @@ class test_automember(UI_driver): delete=False) # host group rule - self.navigate_by_menu('policy/automember/amhostgroup') + self.navigate_by_menu('identity/automember/amhostgroup') self.basic_crud(ENTITY, HOST_GROUP_DATA, search_facet='searchhostgroup', diff --git a/ipatests/test_webui/test_dns.py b/ipatests/test_webui/test_dns.py index ffbd0ab2b..c220200dd 100644 --- a/ipatests/test_webui/test_dns.py +++ b/ipatests/test_webui/test_dns.py @@ -167,5 +167,5 @@ class test_dns(UI_driver): Basic CRUD: dnsconfig """ self.init_app() - self.navigate_by_menu('identity/dns/dnsconfig') + self.navigate_by_menu('network_services/dns/dnsconfig') self.mod_record(CONFIG_ENTITY, CONFIG_MOD_DATA) diff --git a/ipatests/test_webui/test_navigation.py b/ipatests/test_webui/test_navigation.py index caf291a90..530a757ad 100644 --- a/ipatests/test_webui/test_navigation.py +++ b/ipatests/test_webui/test_navigation.py @@ -37,6 +37,8 @@ ENTITIES = [ # TODO: dnsrecord 'dnsconfig', 'cert', + 'otptoken', + 'radiusproxy', 'realmdomains', 'hbacrule', 'hbacsvc', @@ -77,6 +79,7 @@ class test_navigation(UI_driver): if not self.has_dns(): unsupported.extend([ 'dnszone', + 'dnsforwardzone', 'dnsconfig', ]) if not self.has_ca(): @@ -99,6 +102,7 @@ class test_navigation(UI_driver): self.init_app() + # Identity # don't start by users (default) self.navigate_by_menu('identity/group', False) self.navigate_by_menu('identity/user', False) @@ -106,18 +110,11 @@ class test_navigation(UI_driver): self.navigate_by_menu('identity/hostgroup', False) self.navigate_by_menu('identity/netgroup', False) self.navigate_by_menu('identity/service', False) - if self.has_dns(): - self.navigate_by_menu('identity/dns/dnsconfig', True) - self.navigate_by_menu('identity/dns', False) - self.navigate_by_menu('identity/dns/dnszone', False) - self.navigate_by_menu('identity/dns/dnsforwardzone') - else: - self.assert_menu_item('identity/dns', False) - if self.has_ca(): - self.navigate_by_menu('identity/cert', False) - else: - self.assert_menu_item('identity/cert', False) - self.navigate_by_menu('identity/realmdomains', False) + self.navigate_by_menu('identity/automember', False) + self.navigate_by_menu('identity/automember/amhostgroup') + self.navigate_by_menu('identity/automember/amgroup') + + # Policy self.navigate_by_menu('policy') self.navigate_by_menu('policy/hbac', False) self.navigate_by_menu('policy/hbac/hbacsvc', False) @@ -128,21 +125,40 @@ class test_navigation(UI_driver): self.navigate_by_menu('policy/sudo/sudorule', False) self.navigate_by_menu('policy/sudo/sudocmd') self.navigate_by_menu('policy/sudo/sudocmdgroup') - self.navigate_by_menu('policy/automount', False) + self.navigate_by_menu('policy/selinuxusermap', False) self.navigate_by_menu('policy/pwpolicy', False) self.navigate_by_menu('policy/krbtpolicy', False) - self.navigate_by_menu('policy/selinuxusermap', False) - self.navigate_by_menu('policy/automember', False) - self.navigate_by_menu('policy/automember/amhostgroup') - self.navigate_by_menu('policy/automember/amgroup') + + # Authentication + self.navigate_by_menu('authentication') + self.navigate_by_menu('authentication/radiusproxy', False) + self.navigate_by_menu('authentication/otptoken', False) + if self.has_ca(): + self.navigate_by_menu('authentication/cert', False) + else: + self.assert_menu_item('authentication/cert', False) + + # Network Services + self.navigate_by_menu('network_services') + self.navigate_by_menu('network_services/automount') + if self.has_dns(): + self.navigate_by_menu('network_services/dns/dnsconfig', True) + self.navigate_by_menu('network_services/dns', False) + self.navigate_by_menu('network_services/dns/dnszone', False) + self.navigate_by_menu('network_services/dns/dnsforwardzone') + else: + self.assert_menu_item('network_services/dns', False) + + # IPA Server self.navigate_by_menu('ipaserver') - self.navigate_by_menu('ipaserver/rolebased', False) - self.navigate_by_menu('ipaserver/rolebased/privilege', False) - self.navigate_by_menu('ipaserver/rolebased/role') - self.navigate_by_menu('ipaserver/rolebased/permission') - self.navigate_by_menu('ipaserver/selfservice', False) - self.navigate_by_menu('ipaserver/delegation', False) + self.navigate_by_menu('ipaserver/rbac', False) + self.navigate_by_menu('ipaserver/rbac/privilege', False) + self.navigate_by_menu('ipaserver/rbac/role') + self.navigate_by_menu('ipaserver/rbac/permission') + self.navigate_by_menu('ipaserver/rbac/selfservice') + self.navigate_by_menu('ipaserver/rbac/delegation') self.navigate_by_menu('ipaserver/idrange', False) + self.navigate_by_menu('ipaserver/realmdomains', False) if self.has_trusts(): self.navigate_by_menu('ipaserver/trusts', False) self.navigate_by_menu('ipaserver/trusts/trust', False) @@ -151,6 +167,7 @@ class test_navigation(UI_driver): self.assert_menu_item('ipaserver/trusts', False) self.navigate_by_menu('ipaserver/config', False) + def assert_e_url(self, url, e): """ Assert correct url for entity diff --git a/ipatests/test_webui/ui_driver.py b/ipatests/test_webui/ui_driver.py index 047009a29..a1371806c 100644 --- a/ipatests/test_webui/ui_driver.py +++ b/ipatests/test_webui/ui_driver.py @@ -427,7 +427,7 @@ class UI_driver(object): s = ".navbar a[href='#%s']" % item link = self.find(s, By.CSS_SELECTOR, strict=True) - assert link.is_displayed(), 'Navigation link is not displayed' + assert link.is_displayed(), 'Navigation link is not displayed: %s' % item link.click() self.wait_for_request() self.wait_for_request(0.4) -- cgit