diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2011-05-06 16:26:53 -0400 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2011-05-11 11:17:30 -0400 |
| commit | 90fb4ca00a26d8509ee22721474b09d080c6ce93 (patch) | |
| tree | 42278d308557b8c497a14d7375c5d57148cf7bf3 /install | |
| parent | 3edb8ed5451772506489d4763d193730de1d022c (diff) | |
| download | freeipa-90fb4ca00a26d8509ee22721474b09d080c6ce93.tar.gz freeipa-90fb4ca00a26d8509ee22721474b09d080c6ce93.tar.xz freeipa-90fb4ca00a26d8509ee22721474b09d080c6ce93.zip | |
Updated Selenium tests.
The following test suites have been updated to use the new DOM
structure: SUDO, password policy, Kerberos Ticket policy, ACI.
Diffstat (limited to 'install')
35 files changed, 425 insertions, 215 deletions
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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&identity=1&policy=4</td> + <td>/ipa/ui/#navigation=policy&policy=krbtpolicy</td> <td></td> </tr> <tr> @@ -24,40 +24,80 @@ <tr> <td>type</td> <td>krbmaxrenewableage</td> + <td></td> +</tr> +<tr> + <td>typeKeys</td> + <td>krbmaxrenewableage</td> <td>100</td> </tr> <tr> <td>type</td> <td>krbmaxticketlife</td> + <td></td> +</tr> +<tr> + <td>typeKeys</td> + <td>krbmaxticketlife</td> <td>100</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> <tr> <td>type</td> <td>krbmaxrenewableage</td> + <td></td> +</tr> +<tr> + <td>typeKeys</td> + <td>krbmaxrenewableage</td> <td>604800</td> </tr> <tr> <td>type</td> <td>krbmaxticketlife</td> + <td></td> +</tr> +<tr> + <td>typeKeys</td> + <td>krbmaxticketlife</td> <td>86400</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=permission</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']/div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='role'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=permission</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']/div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='role'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=permission</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-permission-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-permission-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-permission-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=permission</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testpermission']</td> <td></td> </tr> <tr> @@ -38,27 +38,32 @@ </tr> <tr> <td>click</td> - <td>//div[@id='role']//span[@name='permissions']//input[@value='add']</td> + <td>css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='add']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//span[@name='permissions']//input[@value='delete']</td> + <td>css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='delete']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//span[@name='permissions']//input[@value='write']</td> + <td>css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='write']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//dd[@name='attrs']//input[@value='cn']</td> + <td>css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='cn']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//dd[@name='attrs']//input[@value='description']</td> + <td>css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='description']</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>undo</td> <td></td> </tr> <tr> @@ -67,33 +72,43 @@ <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//span[@name='permissions']//input[@value='write']</td> + <td>css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='write']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//span[@name='permissions']//input[@value='add']</td> + <td>css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='add']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//span[@name='permissions']//input[@value='delete']</td> + <td>css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='delete']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//dd[@name='attrs']//input[@value='cn']</td> + <td>css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='cn']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//dd[@name='attrs']//input[@value='description']</td> + <td>css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='description']</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>undo</td> <td></td> </tr> <tr> @@ -102,7 +117,12 @@ <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=privilege</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']/div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=privilege</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']/div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=privilege</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-privilege-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-privilege-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-privilege-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=privilege</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td> + <td>css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege']</td> <td></td> </tr> <tr> @@ -37,6 +37,16 @@ <td></td> </tr> <tr> + <td>click</td> + <td>details</td> + <td></td> +</tr> +<tr> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> <td>type</td> <td>description</td> <td></td> @@ -47,6 +57,11 @@ <td>xxx</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> @@ -57,6 +72,11 @@ <td></td> </tr> <tr> + <td>verifyTextNotPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>type</td> <td>description</td> <td></td> @@ -67,6 +87,11 @@ <td>Test Privilege</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> @@ -76,6 +101,11 @@ <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> +<tr> + <td>verifyTextNotPresent</td> + <td>undo</td> + <td></td> +</tr> </tbody></table> </body> </html> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=3</td> + <td>/ipa/ui/#navigation=policy&policy=pwpolicy</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='pwpolicy']//div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='pwpolicy'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=3</td> + <td>/ipa/ui/#navigation=policy&policy=pwpolicy</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='pwpolicy']//div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='pwpolicy'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=3</td> + <td>/ipa/ui/#navigation=policy&policy=pwpolicy</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='pwpolicy'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testgroup:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -77,12 +77,22 @@ <td>5</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=role</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']/div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='role'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=role</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='role']/div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='role'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=role</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-role-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-role-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-role-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=2&role-entity=role</td> + <td>/ipa/ui/#navigation=ipaserver&ipaserver=rolebased</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td> + <td>css=.entity[name='role'] .facet[name='search'] input[value='testrole']</td> <td></td> </tr> <tr> @@ -37,6 +37,16 @@ <td></td> </tr> <tr> + <td>click</td> + <td>link=Settings</td> + <td></td> +</tr> +<tr> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> <td>type</td> <td>description</td> <td></td> @@ -47,6 +57,11 @@ <td>xxx</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> @@ -57,6 +72,11 @@ <td></td> </tr> <tr> + <td>verifyTextNotPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>type</td> <td>description</td> <td></td> @@ -67,6 +87,11 @@ <td>Test Role</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> @@ -76,6 +101,11 @@ <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> +<tr> + <td>verifyTextNotPresent</td> + <td>undo</td> + <td></td> +</tr> </tbody></table> </body> </html> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-sudocmd-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-sudocmd-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-sudocmd-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudocmd:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Add</td> + <td>css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,17 +68,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='memberof_sudocmdgroup']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='memberof_sudocmdgroup']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Delete</td> + <td>css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -93,7 +93,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='memberof_sudocmdgroup']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmd'] .facet[name='details'] span[name='memberof_sudocmdgroup'] input[value='testsudocmdgroup']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmd</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmd</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmd'] .facet[name='search'] input[value='testsudocmd']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudocmd:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -47,12 +47,22 @@ <td>xxx</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> @@ -67,12 +77,22 @@ <td>Test Sudo Command</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-sudocmdgroup-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-sudocmdgroup-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-sudocmdgroup-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudocmdgroup:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Add</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,17 +68,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='member_sudocmd']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='member_sudocmd']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Delete</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -93,7 +93,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='member_sudocmd']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='details'] span[name='member_sudocmd'] input[value='testsudocmd']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2&sudorule-entity=sudocmdgroup</td> + <td>/ipa/ui/#navigation=policy&policy=sudo&sudo=sudocmdgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td> + <td>css=.entity[name='sudocmdgroup'] .facet[name='search'] input[value='testsudocmdgroup']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudocmdgroup:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -47,12 +47,22 @@ <td>xxx</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> @@ -67,12 +77,22 @@ <td>Test Sudo Command Group</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2</td> + <td>/ipa/ui/#navigation=policy&policy=sudo</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudorule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -42,12 +42,22 @@ <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> @@ -57,12 +67,22 @@ <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2</td> + <td>/ipa/ui/#navigation=policy&policy=sudo</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']/div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2</td> + <td>/ipa/ui/#navigation=policy&policy=sudo</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudorule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//a[@title='Add']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,17 +68,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] input[value='testsudocmd']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//a[@title='Delete']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -93,7 +93,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//input[@value='testsudocmd']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberallowcmd_sudocmd'] input[value='testsudocmd']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2</td> + <td>/ipa/ui/#navigation=policy&policy=sudo</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']/div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2</td> + <td>/ipa/ui/#navigation=policy&policy=sudo</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-sudorule-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-sudorule-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-sudorule-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2</td> + <td>/ipa/ui/#navigation=policy&policy=sudo</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudorule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//a[@title='Add']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,17 +68,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//a[@title='Delete']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -93,7 +93,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2</td> + <td>/ipa/ui/#navigation=policy&policy=sudo</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudorule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -47,12 +47,22 @@ <td>Test Sudo Rule</td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> @@ -67,12 +77,22 @@ <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> <td>undo</td> <td></td> </tr> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2</td> + <td>/ipa/ui/#navigation=policy&policy=sudo</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudorule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//a[@title='Add']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,17 +68,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//input[@value='testuser']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] input[value='testuser']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//input[@value='testuser']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] input[value='testuser']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//a[@title='Delete']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -93,7 +93,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//input[@value='testuser']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='ipasudorunas_user'] input[value='testuser']</td> <td></td> </tr> </tbody></table> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=2</td> + <td>/ipa/ui/#navigation=policy&policy=sudo</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td> + <td>css=.entity[name='sudorule'] .facet[name='search'] input[value='testsudorule']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testsudorule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//a[@title='Add']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,17 +68,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//a[@title='Delete']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -93,7 +93,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td> + <td>css=.entity[name='sudorule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser']</td> <td></td> </tr> </tbody></table> |