From 90fb4ca00a26d8509ee22721474b09d080c6ce93 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 6 May 2011 16:26:53 -0400 Subject: Updated Selenium tests. The following test suites have been updated to use the new DOM structure: SUDO, password policy, Kerberos Ticket policy, ACI. --- install/ui/test/functional/krbtpolicy-mod.html | 46 +++++++++++++++++++-- install/ui/test/functional/permission-add.html | 8 ++-- install/ui/test/functional/permission-del.html | 10 ++--- install/ui/test/functional/permission-find.html | 16 ++++---- install/ui/test/functional/permission-mod.html | 48 +++++++++++++++------- install/ui/test/functional/privilege-add.html | 8 ++-- install/ui/test/functional/privilege-del.html | 10 ++--- install/ui/test/functional/privilege-find.html | 16 ++++---- install/ui/test/functional/privilege-mod.html | 34 ++++++++++++++- install/ui/test/functional/pwpolicy-add.html | 8 ++-- install/ui/test/functional/pwpolicy-del.html | 10 ++--- install/ui/test/functional/pwpolicy-mod.html | 20 ++++++--- install/ui/test/functional/role-add.html | 8 ++-- install/ui/test/functional/role-del.html | 10 ++--- install/ui/test/functional/role-find.html | 16 ++++---- install/ui/test/functional/role-mod.html | 34 ++++++++++++++- install/ui/test/functional/sudocmd-add.html | 8 ++-- install/ui/test/functional/sudocmd-del.html | 10 ++--- install/ui/test/functional/sudocmd-find.html | 16 ++++---- install/ui/test/functional/sudocmd-membership.html | 18 ++++---- install/ui/test/functional/sudocmd-mod.html | 32 ++++++++++++--- install/ui/test/functional/sudocmdgroup-add.html | 8 ++-- install/ui/test/functional/sudocmdgroup-del.html | 10 ++--- install/ui/test/functional/sudocmdgroup-find.html | 16 ++++---- .../ui/test/functional/sudocmdgroup-member.html | 18 ++++---- install/ui/test/functional/sudocmdgroup-mod.html | 32 ++++++++++++--- .../ui/test/functional/sudorule-activation.html | 32 ++++++++++++--- install/ui/test/functional/sudorule-add.html | 8 ++-- .../ui/test/functional/sudorule-allow-command.html | 18 ++++---- install/ui/test/functional/sudorule-del.html | 10 ++--- install/ui/test/functional/sudorule-find.html | 16 ++++---- install/ui/test/functional/sudorule-host.html | 18 ++++---- install/ui/test/functional/sudorule-mod.html | 32 ++++++++++++--- install/ui/test/functional/sudorule-runasuser.html | 18 ++++---- install/ui/test/functional/sudorule-user.html | 18 ++++---- 35 files changed, 425 insertions(+), 215 deletions(-) (limited to 'install') diff --git a/install/ui/test/functional/krbtpolicy-mod.html b/install/ui/test/functional/krbtpolicy-mod.html index e10406701..ab46ecb8c 100644 --- a/install/ui/test/functional/krbtpolicy-mod.html +++ b/install/ui/test/functional/krbtpolicy-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&identity=1&policy=4 + /ipa/ui/#navigation=policy&policy=krbtpolicy @@ -24,40 +24,80 @@ type krbmaxrenewableage + + + + typeKeys + krbmaxrenewableage 100 type krbmaxticketlife + + + + typeKeys + krbmaxticketlife 100 + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo type krbmaxrenewableage + + + + typeKeys + krbmaxrenewableage 604800 type krbmaxticketlife + + + + typeKeys + krbmaxticketlife 86400 + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/permission-add.html b/install/ui/test/functional/permission-add.html index 33094e3b6..a8793fe52 100644 --- a/install/ui/test/functional/permission-add.html +++ b/install/ui/test/functional/permission-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=permission + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] click - //div[@id='role']/div[@class='action-panel']//a[@title='Add'] + css=.entity[name='role'] .facet[name='search'] a[title='Add'] @@ -68,7 +68,7 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] diff --git a/install/ui/test/functional/permission-del.html b/install/ui/test/functional/permission-del.html index 5822d3e2e..71092feb8 100644 --- a/install/ui/test/functional/permission-del.html +++ b/install/ui/test/functional/permission-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=permission + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] click - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] click - //div[@id='role']/div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='role'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] diff --git a/install/ui/test/functional/permission-find.html b/install/ui/test/functional/permission-find.html index d9330a481..d68588794 100644 --- a/install/ui/test/functional/permission-find.html +++ b/install/ui/test/functional/permission-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=permission + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] type - search-permission-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] type - search-permission-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] type - search-permission-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] diff --git a/install/ui/test/functional/permission-mod.html b/install/ui/test/functional/permission-mod.html index 24022a19b..0515bf11a 100644 --- a/install/ui/test/functional/permission-mod.html +++ b/install/ui/test/functional/permission-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=permission + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testpermission'] + css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] @@ -38,27 +38,32 @@ click - //div[@id='role']//span[@name='permissions']//input[@value='add'] + css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='add'] click - //div[@id='role']//span[@name='permissions']//input[@value='delete'] + css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='delete'] click - //div[@id='role']//span[@name='permissions']//input[@value='write'] + css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='write'] click - //div[@id='role']//dd[@name='attrs']//input[@value='cn'] + css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='cn'] click - //div[@id='role']//dd[@name='attrs']//input[@value='description'] + css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='description'] + + + + verifyTextPresent + undo @@ -67,33 +72,43 @@ - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo click - //div[@id='role']//span[@name='permissions']//input[@value='write'] + css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='write'] click - //div[@id='role']//span[@name='permissions']//input[@value='add'] + css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='add'] click - //div[@id='role']//span[@name='permissions']//input[@value='delete'] + css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='delete'] click - //div[@id='role']//dd[@name='attrs']//input[@value='cn'] + css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='cn'] click - //div[@id='role']//dd[@name='attrs']//input[@value='description'] + css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='description'] + + + + verifyTextPresent + undo @@ -102,7 +117,12 @@ - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/privilege-add.html b/install/ui/test/functional/privilege-add.html index 7d68046fa..6f7e7a9fa 100644 --- a/install/ui/test/functional/privilege-add.html +++ b/install/ui/test/functional/privilege-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=privilege + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] click - //div[@id='role']/div[@class='action-panel']//a[@title='Add'] + css=.entity[name='privilege'] .facet[name='search'] a[title='Add'] @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] diff --git a/install/ui/test/functional/privilege-del.html b/install/ui/test/functional/privilege-del.html index 7a069effc..e4575ea9f 100644 --- a/install/ui/test/functional/privilege-del.html +++ b/install/ui/test/functional/privilege-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=privilege + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] click - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] click - //div[@id='role']/div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='privilege'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] diff --git a/install/ui/test/functional/privilege-find.html b/install/ui/test/functional/privilege-find.html index 8161b7697..5410313d9 100644 --- a/install/ui/test/functional/privilege-find.html +++ b/install/ui/test/functional/privilege-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=privilege + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] type - search-privilege-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] type - search-privilege-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] type - search-privilege-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] diff --git a/install/ui/test/functional/privilege-mod.html b/install/ui/test/functional/privilege-mod.html index b29728763..54894a109 100644 --- a/install/ui/test/functional/privilege-mod.html +++ b/install/ui/test/functional/privilege-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=privilege + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testprivilege'] + css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] @@ -36,6 +36,16 @@ //span[@id='header-network-activity-indicator'] + + click + details + + + + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + type description @@ -46,6 +56,11 @@ description xxx + + verifyTextPresent + undo + + click link=Update @@ -56,6 +71,11 @@ //span[@id='header-network-activity-indicator'] + + verifyTextNotPresent + undo + + type description @@ -66,6 +86,11 @@ description Test Privilege + + verifyTextPresent + undo + + click link=Update @@ -76,6 +101,11 @@ //span[@id='header-network-activity-indicator'] + + verifyTextNotPresent + undo + + diff --git a/install/ui/test/functional/pwpolicy-add.html b/install/ui/test/functional/pwpolicy-add.html index b18261e58..b80fb2b66 100644 --- a/install/ui/test/functional/pwpolicy-add.html +++ b/install/ui/test/functional/pwpolicy-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=3 + /ipa/ui/#navigation=policy&policy=pwpolicy @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup'] click - //div[@id='pwpolicy']//div[@class='action-panel']//a[@title='Add'] + css=.entity[name='pwpolicy'] .facet[name='search'] a[title='Add'] @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup'] diff --git a/install/ui/test/functional/pwpolicy-del.html b/install/ui/test/functional/pwpolicy-del.html index 29dfa092f..cf16525c6 100644 --- a/install/ui/test/functional/pwpolicy-del.html +++ b/install/ui/test/functional/pwpolicy-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=3 + /ipa/ui/#navigation=policy&policy=pwpolicy @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup'] click - //div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup'] click - //div[@id='pwpolicy']//div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='pwpolicy'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup'] diff --git a/install/ui/test/functional/pwpolicy-mod.html b/install/ui/test/functional/pwpolicy-mod.html index 6fab27fab..0925c70bc 100644 --- a/install/ui/test/functional/pwpolicy-mod.html +++ b/install/ui/test/functional/pwpolicy-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=3 + /ipa/ui/#navigation=policy&policy=pwpolicy @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup'] @@ -32,8 +32,8 @@ - waitForTextPresent - testgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -76,13 +76,23 @@ krbpwdminlength 5 + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/role-add.html b/install/ui/test/functional/role-add.html index 4da53f7fb..71cdd267a 100644 --- a/install/ui/test/functional/role-add.html +++ b/install/ui/test/functional/role-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=role + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] click - //div[@id='role']/div[@class='action-panel']//a[@title='Add'] + css=.entity[name='role'] .facet[name='search'] a[title='Add'] @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] diff --git a/install/ui/test/functional/role-del.html b/install/ui/test/functional/role-del.html index 8a05cf767..14f853ddc 100644 --- a/install/ui/test/functional/role-del.html +++ b/install/ui/test/functional/role-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=role + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] click - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] click - //div[@id='role']/div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='role'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] diff --git a/install/ui/test/functional/role-find.html b/install/ui/test/functional/role-find.html index 0757707cd..73294ddfa 100644 --- a/install/ui/test/functional/role-find.html +++ b/install/ui/test/functional/role-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=role + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] type - search-role-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] type - search-role-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] type - search-role-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] diff --git a/install/ui/test/functional/role-mod.html b/install/ui/test/functional/role-mod.html index 343b68105..38b266535 100644 --- a/install/ui/test/functional/role-mod.html +++ b/install/ui/test/functional/role-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=2&role-entity=role + /ipa/ui/#navigation=ipaserver&ipaserver=rolebased @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='role']//span[@name='search']//input[@value='testrole'] + css=.entity[name='role'] .facet[name='search'] input[value='testrole'] @@ -36,6 +36,16 @@ //span[@id='header-network-activity-indicator'] + + click + link=Settings + + + + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + type description @@ -46,6 +56,11 @@ description xxx + + verifyTextPresent + undo + + click link=Update @@ -56,6 +71,11 @@ //span[@id='header-network-activity-indicator'] + + verifyTextNotPresent + undo + + type description @@ -66,6 +86,11 @@ description Test Role + + verifyTextPresent + undo + + click link=Update @@ -76,6 +101,11 @@ //span[@id='header-network-activity-indicator'] + + verifyTextNotPresent + undo + + diff --git a/install/ui/test/functional/sudocmd-add.html b/install/ui/test/functional/sudocmd-add.html index 8b32c783a..765df757d 100644 --- a/install/ui/test/functional/sudocmd-add.html +++ b/install/ui/test/functional/sudocmd-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] click - //div[@id='sudorule']//div[@class='action-panel']//a[@title='Add'] + css=.entity[name='sudocmd'] .facet[name='search'] a[title='Add'] @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] diff --git a/install/ui/test/functional/sudocmd-del.html b/install/ui/test/functional/sudocmd-del.html index b3fa77908..551d0fa3e 100644 --- a/install/ui/test/functional/sudocmd-del.html +++ b/install/ui/test/functional/sudocmd-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] click - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] click - //div[@id='sudorule']//div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='sudocmd'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] diff --git a/install/ui/test/functional/sudocmd-find.html b/install/ui/test/functional/sudocmd-find.html index 02b099c01..a28e05a09 100644 --- a/install/ui/test/functional/sudocmd-find.html +++ b/install/ui/test/functional/sudocmd-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] type - search-sudocmd-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] type - search-sudocmd-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] type - search-sudocmd-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] diff --git a/install/ui/test/functional/sudocmd-membership.html b/install/ui/test/functional/sudocmd-membership.html index 7742a4507..4b7b8877f 100644 --- a/install/ui/test/functional/sudocmd-membership.html +++ b/install/ui/test/functional/sudocmd-membership.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] @@ -32,13 +32,13 @@ - waitForTextPresent - testsudocmd: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - link=Add + css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='memberof_sudocmdgroup']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] input[value='testsudocmdgroup'] click - //div[@id='sudorule']//span[@name='memberof_sudocmdgroup']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] input[value='testsudocmdgroup'] click - link=Delete + css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='memberof_sudocmdgroup']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] input[value='testsudocmdgroup'] diff --git a/install/ui/test/functional/sudocmd-mod.html b/install/ui/test/functional/sudocmd-mod.html index de2cfd881..0218b44da 100644 --- a/install/ui/test/functional/sudocmd-mod.html +++ b/install/ui/test/functional/sudocmd-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd'] + css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd'] @@ -32,8 +32,8 @@ - waitForTextPresent - testsudocmd: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -46,13 +46,23 @@ description xxx + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -66,13 +76,23 @@ description Test Sudo Command + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/sudocmdgroup-add.html b/install/ui/test/functional/sudocmdgroup-add.html index 83c403a38..00064d4c9 100644 --- a/install/ui/test/functional/sudocmdgroup-add.html +++ b/install/ui/test/functional/sudocmdgroup-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] click - //div[@id='sudorule']//div[@class='action-panel']//a[@title='Add'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] a[title='Add'] @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] diff --git a/install/ui/test/functional/sudocmdgroup-del.html b/install/ui/test/functional/sudocmdgroup-del.html index 1905e4c76..07238c9ac 100644 --- a/install/ui/test/functional/sudocmdgroup-del.html +++ b/install/ui/test/functional/sudocmdgroup-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] click - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] click - //div[@id='sudorule']//div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] diff --git a/install/ui/test/functional/sudocmdgroup-find.html b/install/ui/test/functional/sudocmdgroup-find.html index 44bfe9c4a..718296067 100644 --- a/install/ui/test/functional/sudocmdgroup-find.html +++ b/install/ui/test/functional/sudocmdgroup-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] type - search-sudocmdgroup-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] type - search-sudocmdgroup-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] type - search-sudocmdgroup-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] diff --git a/install/ui/test/functional/sudocmdgroup-member.html b/install/ui/test/functional/sudocmdgroup-member.html index 06e9ca584..2a8070ee7 100644 --- a/install/ui/test/functional/sudocmdgroup-member.html +++ b/install/ui/test/functional/sudocmdgroup-member.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] @@ -32,13 +32,13 @@ - waitForTextPresent - testsudocmdgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - link=Add + css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='member_sudocmd']//input[@value='testsudocmd'] + css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] input[value='testsudocmd'] click - //div[@id='sudorule']//span[@name='member_sudocmd']//input[@value='testsudocmd'] + css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] input[value='testsudocmd'] click - link=Delete + css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='member_sudocmd']//input[@value='testsudocmd'] + css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] input[value='testsudocmd'] diff --git a/install/ui/test/functional/sudocmdgroup-mod.html b/install/ui/test/functional/sudocmdgroup-mod.html index 0be7c20c2..1e809d746 100644 --- a/install/ui/test/functional/sudocmdgroup-mod.html +++ b/install/ui/test/functional/sudocmdgroup-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup + /ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup'] + css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup'] @@ -32,8 +32,8 @@ - waitForTextPresent - testsudocmdgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -46,13 +46,23 @@ description xxx + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -66,13 +76,23 @@ description Test Sudo Command Group + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/sudorule-activation.html b/install/ui/test/functional/sudorule-activation.html index 99c18050a..51cc6afbc 100644 --- a/install/ui/test/functional/sudorule-activation.html +++ b/install/ui/test/functional/sudorule-activation.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2 + /ipa/ui/#navigation=policy&policy=sudo @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] @@ -32,8 +32,8 @@ - waitForTextPresent - testsudorule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -41,13 +41,23 @@ //input[@name='ipaenabledflag' and @value='FALSE'] + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -56,13 +66,23 @@ ipaenabledflag + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/sudorule-add.html b/install/ui/test/functional/sudorule-add.html index 20dc9b093..a4ed43ffc 100644 --- a/install/ui/test/functional/sudorule-add.html +++ b/install/ui/test/functional/sudorule-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2 + /ipa/ui/#navigation=policy&policy=sudo @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] click - //div[@id='sudorule']/div[@class='action-panel']//a[@title='Add'] + css=.entity[name='sudorule'] .facet[name='search'] a[title='Add'] @@ -48,7 +48,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] diff --git a/install/ui/test/functional/sudorule-allow-command.html b/install/ui/test/functional/sudorule-allow-command.html index 03f25ff8e..3549eab54 100644 --- a/install/ui/test/functional/sudorule-allow-command.html +++ b/install/ui/test/functional/sudorule-allow-command.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2 + /ipa/ui/#navigation=policy&policy=sudo @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] @@ -32,13 +32,13 @@ - waitForTextPresent - testsudorule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//a[@title='Add'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//input[@value='testsudocmd'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] input[value='testsudocmd'] click - //div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//input[@value='testsudocmd'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] input[value='testsudocmd'] click - //div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//a[@title='Delete'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//input[@value='testsudocmd'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] input[value='testsudocmd'] diff --git a/install/ui/test/functional/sudorule-del.html b/install/ui/test/functional/sudorule-del.html index d265bbabc..8538abc77 100644 --- a/install/ui/test/functional/sudorule-del.html +++ b/install/ui/test/functional/sudorule-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2 + /ipa/ui/#navigation=policy&policy=sudo @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] click - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] click - //div[@id='sudorule']/div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='sudorule'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] diff --git a/install/ui/test/functional/sudorule-find.html b/install/ui/test/functional/sudorule-find.html index cab6bca09..0e78e77b8 100644 --- a/install/ui/test/functional/sudorule-find.html +++ b/install/ui/test/functional/sudorule-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2 + /ipa/ui/#navigation=policy&policy=sudo @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] type - search-sudorule-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] type - search-sudorule-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] type - search-sudorule-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] diff --git a/install/ui/test/functional/sudorule-host.html b/install/ui/test/functional/sudorule-host.html index c0e0e7b07..625e3a1a1 100644 --- a/install/ui/test/functional/sudorule-host.html +++ b/install/ui/test/functional/sudorule-host.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2 + /ipa/ui/#navigation=policy&policy=sudo @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] @@ -32,13 +32,13 @@ - waitForTextPresent - testsudorule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//a[@title='Add'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com'] click - //div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com'] click - //div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//a[@title='Delete'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com'] diff --git a/install/ui/test/functional/sudorule-mod.html b/install/ui/test/functional/sudorule-mod.html index adddb65b2..48b8f2bfa 100644 --- a/install/ui/test/functional/sudorule-mod.html +++ b/install/ui/test/functional/sudorule-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2 + /ipa/ui/#navigation=policy&policy=sudo @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] @@ -32,8 +32,8 @@ - waitForTextPresent - testsudorule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -46,13 +46,23 @@ description Test Sudo Rule + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -66,13 +76,23 @@ description + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/sudorule-runasuser.html b/install/ui/test/functional/sudorule-runasuser.html index 7119f53d1..87cc535cb 100644 --- a/install/ui/test/functional/sudorule-runasuser.html +++ b/install/ui/test/functional/sudorule-runasuser.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2 + /ipa/ui/#navigation=policy&policy=sudo @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] @@ -32,13 +32,13 @@ - waitForTextPresent - testsudorule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//a[@title='Add'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//input[@value='testuser'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] input[value='testuser'] click - //div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//input[@value='testuser'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] input[value='testuser'] click - //div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//a[@title='Delete'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//input[@value='testuser'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] input[value='testuser'] diff --git a/install/ui/test/functional/sudorule-user.html b/install/ui/test/functional/sudorule-user.html index 153fd441e..50d13d7ae 100644 --- a/install/ui/test/functional/sudorule-user.html +++ b/install/ui/test/functional/sudorule-user.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=2 + /ipa/ui/#navigation=policy&policy=sudo @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='search']//input[@value='testsudorule'] + css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule'] @@ -32,13 +32,13 @@ - waitForTextPresent - testsudorule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//a[@title='Add'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser'] click - //div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser'] click - //div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//a[@title='Delete'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser'] + css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser'] -- cgit