diff options
53 files changed, 529 insertions, 474 deletions
diff --git a/install/ui/test/functional/group-add-member-user.html b/install/ui/test/functional/group-add-member-user.html index 6477e7df..a3d199ba 100644 --- a/install/ui/test/functional/group-add-member-user.html +++ b/install/ui/test/functional/group-add-member-user.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=1</td> + <td>/ipa/ui/#navigation=identity&identity=group</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> @@ -32,13 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testgroup:</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='group']/div[1]/ul/li[4]</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -68,17 +63,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='group']//span[@name='association']//input[@value='testuser']</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='group']/div[1]/ul/li[1]/span</td> - <td></td> -</tr> -<tr> - <td>waitForNotVisible</td> - <td>//span[@id='header-network-activity-indicator']</td> + <td>css=.entity[name='group'] .facet[name='member_user'] input[value='testuser']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/group-add.html b/install/ui/test/functional/group-add.html index 738136ea..5e94d6fb 100644 --- a/install/ui/test/functional/group-add.html +++ b/install/ui/test/functional/group-add.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=1</td> + <td>/ipa/ui/#navigation=identity&identity=group</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='group']/div/ul/li[1]/span/span/a[2]</td> + <td>link=Add</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/group-del.html b/install/ui/test/functional/group-del.html index 84074cd8..99f8c10f 100644 --- a/install/ui/test/functional/group-del.html +++ b/install/ui/test/functional/group-del.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=1</td> + <td>/ipa/ui/#navigation=identity&identity=group</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> @@ -33,7 +33,7 @@ </tr> <tr> <td>click</td> - <td>//div[@id='group']/div/ul/li[1]/span/span/a[1]</td> + <td>link=Delete</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/group-find.html b/install/ui/test/functional/group-find.html index 1f9c3482..cc2f9886 100644 --- a/install/ui/test/functional/group-find.html +++ b/install/ui/test/functional/group-find.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=1</td> + <td>/ipa/ui/#navigation=identity&identity=group</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-group-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-group-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-group-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/group-mod.html b/install/ui/test/functional/group-mod.html index 092bc921..09ebc17f 100644 --- a/install/ui/test/functional/group-mod.html +++ b/install/ui/test/functional/group-mod.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=1</td> + <td>/ipa/ui/#navigation=identity&identity=group</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> @@ -32,8 +32,18 @@ <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> + <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> @@ -47,12 +57,22 @@ <td>Test Group 123</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,18 +87,13 @@ <td>Test Group</td> </tr> <tr> - <td>click</td> - <td>link=Update</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> + <td>verifyTextPresent</td> <td>undo</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='group']/div[1]/ul/li[1]/span</td> + <td>link=Update</td> <td></td> </tr> <tr> @@ -86,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/group-remove-member-user.html b/install/ui/test/functional/group-remove-member-user.html index bd44e643..8f653799 100644 --- a/install/ui/test/functional/group-remove-member-user.html +++ b/install/ui/test/functional/group-remove-member-user.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=1</td> + <td>/ipa/ui/#navigation=identity&identity=group</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td> + <td>css=.entity[name='group'] .facet[name='search'] input[value='testgroup']</td> <td></td> </tr> <tr> @@ -32,28 +32,18 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testgroup:</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='group']/div[1]/ul/li[@title='member_user']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='group']//span[@name='association']//input[@value='testuser']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='group']//span[@name='association']//input[@value='testuser']</td> + <td>css=.entity[name='group'] .facet[name='member_user'] input[value='testuser']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='group']/div[1]/ul/li[4]/ul/li[2]/span/a[1]</td> + <td>css=.entity[name='group'] .facet[name='member_user'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -62,18 +52,13 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>//div[@id='group']/span/table/tbody/tr</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='group']/div[1]/ul/li[1]/span</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> - <td>waitForNotVisible</td> - <td>//span[@id='header-network-activity-indicator']</td> + <td>waitForElementNotPresent</td> + <td>css=.entity[name='group'] .facet[name='member_user'] input[value='testuser']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacrule-activation.html b/install/ui/test/functional/hbacrule-activation.html index 30f7d608..ec4865c6 100644 --- a/install/ui/test/functional/hbacrule-activation.html +++ b/install/ui/test/functional/hbacrule-activation.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1</td> + <td>/ipa/ui/#navigation=policy&policy=hbac</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacrule:</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/hbacrule-add.html b/install/ui/test/functional/hbacrule-add.html index 74e43b5a..ad3b2266 100644 --- a/install/ui/test/functional/hbacrule-add.html +++ b/install/ui/test/functional/hbacrule-add.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1</td> + <td>/ipa/ui/#navigation=policy&policy=hbac</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacrule-del.html b/install/ui/test/functional/hbacrule-del.html index c513aff9..21bcbec4 100644 --- a/install/ui/test/functional/hbacrule-del.html +++ b/install/ui/test/functional/hbacrule-del.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1</td> + <td>/ipa/ui/#navigation=policy&policy=hbac</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacrule-find.html b/install/ui/test/functional/hbacrule-find.html index 236fb1ff..20352fd4 100644 --- a/install/ui/test/functional/hbacrule-find.html +++ b/install/ui/test/functional/hbacrule-find.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1</td> + <td>/ipa/ui/#navigation=policy&policy=hbac</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hbacrule-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hbacrule-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hbacrule-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacrule-host.html b/install/ui/test/functional/hbacrule-host.html index 01dbb777..84701aa6 100644 --- a/install/ui/test/functional/hbacrule-host.html +++ b/install/ui/test/functional/hbacrule-host.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1</td> + <td>/ipa/ui/#navigation=policy&policy=hbac</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacrule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//a[@title='Add']</td> + <td>css=.entity[name='hbacrule'] .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='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//a[@title='Delete']</td> + <td>css=.entity[name='hbacrule'] .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='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td> + <td>css=.entity[name='hbacrule'] .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/hbacrule-mod.html b/install/ui/test/functional/hbacrule-mod.html index 22d46c8f..4f1ae505 100644 --- a/install/ui/test/functional/hbacrule-mod.html +++ b/install/ui/test/functional/hbacrule-mod.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1</td> + <td>/ipa/ui/#navigation=policy&policy=hbac</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacrule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -52,12 +52,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> @@ -77,12 +87,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/hbacrule-service.html b/install/ui/test/functional/hbacrule-service.html index 7e777ea3..b5597e57 100644 --- a/install/ui/test/functional/hbacrule-service.html +++ b/install/ui/test/functional/hbacrule-service.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1</td> + <td>/ipa/ui/#navigation=policy&policy=hbac</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacrule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//a[@title='Add']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,17 +68,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//a[@title='Delete']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -93,7 +93,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] input[value='testhbacsvc']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacrule-sourcehost.html b/install/ui/test/functional/hbacrule-sourcehost.html index ac213f5d..f998bad3 100644 --- a/install/ui/test/functional/hbacrule-sourcehost.html +++ b/install/ui/test/functional/hbacrule-sourcehost.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1</td> + <td>/ipa/ui/#navigation=policy&policy=hbac</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacrule:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//a[@title='Add']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,17 +68,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//input[@value='test.example.com']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//input[@value='test.example.com']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//a[@title='Delete']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -93,7 +93,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//input[@value='test.example.com']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] input[value='test.example.com']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacrule-user.html b/install/ui/test/functional/hbacrule-user.html index 59abc848..d8ce7984 100644 --- a/install/ui/test/functional/hbacrule-user.html +++ b/install/ui/test/functional/hbacrule-user.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1</td> + <td>/ipa/ui/#navigation=policy&policy=hbac</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td> + <td>css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacrule:</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='hbacrule'] .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='hbacrule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Delete</td> + <td>css=.entity[name='hbacrule'] .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='hbacrule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td> + <td>css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacsvc-add.html b/install/ui/test/functional/hbacsvc-add.html index 98503e6e..31e7d5ce 100644 --- a/install/ui/test/functional/hbacsvc-add.html +++ b/install/ui/test/functional/hbacsvc-add.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvc</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvc</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacsvc-del.html b/install/ui/test/functional/hbacsvc-del.html index 50bac348..03edecce 100644 --- a/install/ui/test/functional/hbacsvc-del.html +++ b/install/ui/test/functional/hbacsvc-del.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvc</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvc</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacsvc-find.html b/install/ui/test/functional/hbacsvc-find.html index 71a09f5f..922e9ce2 100644 --- a/install/ui/test/functional/hbacsvc-find.html +++ b/install/ui/test/functional/hbacsvc-find.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvc</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvc</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hbacsvc-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hbacsvc-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hbacsvc-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacsvc-mod.html b/install/ui/test/functional/hbacsvc-mod.html index 7b498855..26730124 100644 --- a/install/ui/test/functional/hbacsvc-mod.html +++ b/install/ui/test/functional/hbacsvc-mod.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvc</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvc</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacsvc:</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 HBAC Service</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/hbacsvcgroup-add-member.html b/install/ui/test/functional/hbacsvcgroup-add-member.html index a92d2a21..1adf57de 100644 --- a/install/ui/test/functional/hbacsvcgroup-add-member.html +++ b/install/ui/test/functional/hbacsvcgroup-add-member.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> <tr> @@ -32,13 +32,13 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacsvcgroup:</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='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] a[title='Add']</td> <td></td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] input[value='testhbacsvc']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacsvcgroup-add.html b/install/ui/test/functional/hbacsvcgroup-add.html index b174fad3..b91f2eb3 100644 --- a/install/ui/test/functional/hbacsvcgroup-add.html +++ b/install/ui/test/functional/hbacsvcgroup-add.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//div[@class='action-panel']//a[@title='Add']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] a[title='Add']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacsvcgroup-del.html b/install/ui/test/functional/hbacsvcgroup-del.html index bc7ade30..daac295a 100644 --- a/install/ui/test/functional/hbacsvcgroup-del.html +++ b/install/ui/test/functional/hbacsvcgroup-del.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//div[@class='action-panel']//a[@title='Delete']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacsvcgroup-find.html b/install/ui/test/functional/hbacsvcgroup-find.html index 78d21ccb..ec232312 100644 --- a/install/ui/test/functional/hbacsvcgroup-find.html +++ b/install/ui/test/functional/hbacsvcgroup-find.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hbacsvcgroup-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hbacsvcgroup-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hbacsvcgroup-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hbacsvcgroup-mod.html b/install/ui/test/functional/hbacsvcgroup-mod.html index 4ad29009..7041c3e0 100644 --- a/install/ui/test/functional/hbacsvcgroup-mod.html +++ b/install/ui/test/functional/hbacsvcgroup-mod.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacsvcgroup:</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 HBAC Service 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/hbacsvcgroup-remove-member.html b/install/ui/test/functional/hbacsvcgroup-remove-member.html index b48e9bd6..1e85b64d 100644 --- a/install/ui/test/functional/hbacsvcgroup-remove-member.html +++ b/install/ui/test/functional/hbacsvcgroup-remove-member.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup</td> + <td>/ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup']</td> <td></td> </tr> <tr> @@ -32,23 +32,18 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhbacsvcgroup:</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] input[value='testhbacsvc']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Delete</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -63,7 +58,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc']</td> + <td>css=.entity[name='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] input[value='testhbacsvc']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/host-add.html b/install/ui/test/functional/host-add.html index 92657a23..a39f96e4 100644 --- a/install/ui/test/functional/host-add.html +++ b/install/ui/test/functional/host-add.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=2</td> + <td>/ipa/ui/#navigation=identity&identity=host</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='host']/div/ul/li[1]/span/span/a[2]</td> + <td>link=Add</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/host-certificate.html b/install/ui/test/functional/host-certificate.html index 47f3709a..af528edf 100644 --- a/install/ui/test/functional/host-certificate.html +++ b/install/ui/test/functional/host-certificate.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=2</td> + <td>/ipa/ui/#navigation=identity&identity=host</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForVisible</td> - <td>//div[@id='host']//span[@name='certificate_status']//div[@name='certificate-missing']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>waitForVisible</td> - <td>//div[@id='host']//span[@name='certificate_status']//div[@name='certificate-valid']</td> + <td>css=.entity[name='host'] span[name='certificate_status'] div[name='certificate-valid']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='host']//span[@name='certificate_status']//div[@name='certificate-valid']//a[@title='Get']</td> + <td>css=.entity[name='host'] span[name='certificate_status'] div[name='certificate-valid'] a[title='Get']</td> <td></td> </tr> <tr> @@ -111,16 +111,6 @@ <td>css=div.ui-dialog</td> <td></td> </tr> -<tr> - <td>click</td> - <td>//div[@id='host']/div[1]/ul/li[1]/span</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> - <td></td> -</tr> </tbody></table> </body> </html> diff --git a/install/ui/test/functional/host-del.html b/install/ui/test/functional/host-del.html index 4516fa24..471b4ef0 100644 --- a/install/ui/test/functional/host-del.html +++ b/install/ui/test/functional/host-del.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=2</td> + <td>/ipa/ui/#navigation=identity&identity=host</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='host']/div/ul/li[1]/span/span/a[1]</td> + <td>link=Delete</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/host-find.html b/install/ui/test/functional/host-find.html index 7d2c0030..c04be6fd 100644 --- a/install/ui/test/functional/host-find.html +++ b/install/ui/test/functional/host-find.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=2</td> + <td>/ipa/ui/#navigation=identity&identity=host</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-host-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-host-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-host-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/host-mod.html b/install/ui/test/functional/host-mod.html index f1f2b2d6..b2d64bef 100644 --- a/install/ui/test/functional/host-mod.html +++ b/install/ui/test/functional/host-mod.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=2</td> + <td>/ipa/ui/#navigation=identity&identity=host</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>css=.entity[name='host'] .facet[name='search'] input[value='test.example.com']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='host']//span[@name='fqdn'][label='test.example.com']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -44,7 +44,12 @@ <tr> <td>typeKeys</td> <td>description</td> - <td>Test Host</td> + <td>xxx</td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>undo</td> + <td></td> </tr> <tr> <td>click</td> @@ -52,24 +57,44 @@ <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>description</td> + <td></td> +</tr> +<tr> + <td>typeKeys</td> + <td>description</td> + <td>Test Host</td> +</tr> +<tr> + <td>verifyTextPresent</td> <td>undo</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='host']/div[1]/ul/li[1]/span</td> + <td>link=Update</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> - <td>verifyText</td> - <td>css=#host table.search-table tbody tr:nth-child(2) span[name=description]</td> - <td>Test Host</td> + <td>verifyTextNotPresent</td> + <td>undo</td> + <td></td> </tr> </tbody></table> </body> diff --git a/install/ui/test/functional/hostgroup-add-member-host.html b/install/ui/test/functional/hostgroup-add-member-host.html index 843bdb2e..d8972a7d 100644 --- a/install/ui/test/functional/hostgroup-add-member-host.html +++ b/install/ui/test/functional/hostgroup-add-member-host.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=3</td> + <td>/ipa/ui/#navigation=identity&identity=hostgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> <tr> @@ -32,13 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhostgroup:</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='hostgroup']/div[1]/ul/li[6]</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -67,18 +62,13 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com']</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='hostgroup']/div[1]/ul/li[1]/span</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> - <td>waitForNotVisible</td> - <td>//span[@id='header-network-activity-indicator']</td> + <td>verifyElementPresent</td> + <td>css=.entity[name='hostgroup'] .facet[name='member_host'] input[value='test.example.com']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hostgroup-add.html b/install/ui/test/functional/hostgroup-add.html index 8188adb4..1670f9a7 100644 --- a/install/ui/test/functional/hostgroup-add.html +++ b/install/ui/test/functional/hostgroup-add.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=3</td> + <td>/ipa/ui/#navigation=identity&identity=hostgroup</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hostgroup']/div/ul/li[1]/span/span/a[2]</td> + <td>link=Add</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hostgroup-del.html b/install/ui/test/functional/hostgroup-del.html index 6faa4c39..abb0b132 100644 --- a/install/ui/test/functional/hostgroup-del.html +++ b/install/ui/test/functional/hostgroup-del.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=3</td> + <td>/ipa/ui/#navigation=identity&identity=hostgroup</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hostgroup']/div/ul/li[1]/span/span/a[1]</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hostgroup-find.html b/install/ui/test/functional/hostgroup-find.html index 13a34328..03871b08 100644 --- a/install/ui/test/functional/hostgroup-find.html +++ b/install/ui/test/functional/hostgroup-find.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=3</td> + <td>/ipa/ui/#navigation=identity&identity=hostgroup</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hostgroup-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hostgroup-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-hostgroup-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/hostgroup-mod b/install/ui/test/functional/hostgroup-mod index fd31960d..c93fa986 100644 --- a/install/ui/test/functional/hostgroup-mod +++ b/install/ui/test/functional/hostgroup-mod @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=3</td> + <td>/ipa/ui/#navigation=identity&identity=hostgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> <tr> @@ -32,8 +32,18 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhostgroup:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <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> @@ -42,12 +52,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> @@ -57,18 +77,13 @@ <td>Test Host Group</td> </tr> <tr> - <td>click</td> - <td>link=Update</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> + <td>verifyTextPresent</td> <td>undo</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hostgroup']/div[1]/ul/li[1]/span</td> + <td>link=Update</td> <td></td> </tr> <tr> @@ -76,6 +91,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/hostgroup-remove-member-host.html b/install/ui/test/functional/hostgroup-remove-member-host.html index 2ad4f4e8..006efed8 100644 --- a/install/ui/test/functional/hostgroup-remove-member-host.html +++ b/install/ui/test/functional/hostgroup-remove-member-host.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=3</td> + <td>/ipa/ui/#navigation=identity&identity=hostgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td> + <td>css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup']</td> <td></td> </tr> <tr> @@ -32,28 +32,18 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testhostgroup:</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[@id='hostgroup']/div[1]/ul/li[6]</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com']</td> + <td>css=.entity[name='hostgroup'] .facet[name='member_host'] input[value='test.example.com']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='hostgroup']/div[1]/ul/li[6]/ul/li[2]/span/a[1]</td> + <td>css=.entity[name='hostgroup'] .facet[name='member_host'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -62,13 +52,8 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>//div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com']</td> - <td></td> -</tr> -<tr> <td>click</td> - <td>//div[@id='hostgroup']/div[1]/ul/li[1]/span</td> + <td>//div[@id='content']/div/div[2]/div[2]/div[1]/div[2]/a[1]</td> <td></td> </tr> <tr> @@ -76,6 +61,11 @@ <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> +<tr> + <td>verifyElementNotPresent</td> + <td>css=.entity[name='hostgroup'] .facet[name='member_host'] input[value='test.example.com']</td> + <td></td> +</tr> </tbody></table> </body> </html> diff --git a/install/ui/test/functional/netgroup-add-member-user.html b/install/ui/test/functional/netgroup-add-member-user.html index 24718fe0..1007ca73 100644 --- a/install/ui/test/functional/netgroup-add-member-user.html +++ b/install/ui/test/functional/netgroup-add-member-user.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=4</td> + <td>/ipa/ui/#navigation=identity&identity=netgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> <tr> @@ -32,18 +32,23 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testnetgroup:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='netgroup']/div[1]/ul/li[9]</td> + <td>css=.entity[name='netgroup'] li[title='memberuser_user'] a</td> + <td></td> +</tr> +<tr> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Enroll</td> + <td>css=.entity[name='netgroup'] .facet[name='memberuser_user'] a[title='Enroll']</td> <td></td> </tr> <tr> @@ -67,8 +72,13 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='netgroup']//span[@name='association']//input[@value='testuser']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>css=.entity[name='netgroup'] .facet[name='memberuser_user'] input[value='testuser']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/netgroup-add.html b/install/ui/test/functional/netgroup-add.html index f0e3be72..1fc58ed7 100644 --- a/install/ui/test/functional/netgroup-add.html +++ b/install/ui/test/functional/netgroup-add.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=4</td> + <td>/ipa/ui/#navigation=identity&identity=netgroup</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='netgroup']/div/ul/li[1]/span/span/a[2]</td> + <td>link=Add</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/netgroup-del.html b/install/ui/test/functional/netgroup-del.html index b949fe01..07ae3167 100644 --- a/install/ui/test/functional/netgroup-del.html +++ b/install/ui/test/functional/netgroup-del.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=4</td> + <td>/ipa/ui/#navigation=identity&identity=netgroup</td> <td></td> </tr> <tr> @@ -23,17 +23,17 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='netgroup']/div/ul/li[1]/span/span/a[1]</td> + <td>link=Delete</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/netgroup-find.html b/install/ui/test/functional/netgroup-find.html index 02b4e3e4..8f95401b 100644 --- a/install/ui/test/functional/netgroup-find.html +++ b/install/ui/test/functional/netgroup-find.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=4</td> + <td>/ipa/ui/#navigation=identity&identity=netgroup</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-netgroup-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-netgroup-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-netgroup-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/netgroup-mod.html b/install/ui/test/functional/netgroup-mod.html index e61c16ab..f87b111e 100644 --- a/install/ui/test/functional/netgroup-mod.html +++ b/install/ui/test/functional/netgroup-mod.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=4</td> + <td>/ipa/ui/#navigation=identity&identity=netgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> <tr> @@ -32,8 +32,18 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testnetgroup:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <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> @@ -62,33 +72,23 @@ <td></td> </tr> <tr> - <td>waitForTextNotPresent</td> + <td>verifyTextPresent</td> <td>undo</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='netgroup']/div[1]/ul/li[1]/span</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']/ancestor::tr//span[@name='description' and text()='xxx']</td> + <td>link=Update</td> <td></td> </tr> <tr> - <td>click</td> - <td>link=testnetgroup</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testnetgroup:</td> + <td>verifyTextNotPresent</td> + <td>undo</td> <td></td> </tr> <tr> @@ -112,18 +112,13 @@ <td>idm.lab.bos.redhat.com</td> </tr> <tr> - <td>click</td> - <td>link=Update</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> + <td>verifyTextPresent</td> <td>undo</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='netgroup']/div[1]/ul/li[1]/span</td> + <td>link=Update</td> <td></td> </tr> <tr> @@ -132,13 +127,8 @@ <td></td> </tr> <tr> - <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']/ancestor::tr//span[@name='description' and text()='Test Netgroup']</td> + <td>verifyTextNotPresent</td> + <td>undo</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/netgroup-remove-member-user.html b/install/ui/test/functional/netgroup-remove-member-user.html index d9c1c315..7482374f 100644 --- a/install/ui/test/functional/netgroup-remove-member-user.html +++ b/install/ui/test/functional/netgroup-remove-member-user.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=4</td> + <td>/ipa/ui/#navigation=identity&identity=netgroup</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td> + <td>css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup']</td> <td></td> </tr> <tr> @@ -32,28 +32,28 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testnetgroup:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='netgroup']/div[1]/ul/li[9]</td> + <td>css=.entity[name='netgroup'] li[title='memberuser_user'] a</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='netgroup']//span[@name='association']//input[@value='testuser']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='netgroup']//span[@name='association']//input[@value='testuser']</td> + <td>css=.entity[name='netgroup'] .facet[name='memberuser_user'] input[value='testuser']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Delete</td> + <td>css=.entity[name='netgroup'] .facet[name='memberuser_user'] a[title='Delete']</td> <td></td> </tr> <tr> @@ -62,8 +62,13 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>//div[@id='netgroup']//span[@name='association']//input[@value='testuser']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>css=.entity[name='netgroup'] .facet[name='memberuser_user'] input[value='testuser']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/service-add.html b/install/ui/test/functional/service-add.html index 42594ef2..e1970231 100644 --- a/install/ui/test/functional/service-add.html +++ b/install/ui/test/functional/service-add.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=5</td> + <td>/ipa/ui/#navigation=identity&identity=service</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice//test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='service']/div/ul/li[1]/span/span/a[2]</td> + <td>link=Add</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/service-certificate.html b/install/ui/test/functional/service-certificate.html index bcfce1fa..1f33160a 100644 --- a/install/ui/test/functional/service-certificate.html +++ b/install/ui/test/functional/service-certificate.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=5</td> + <td>/ipa/ui/#navigation=identity&identity=service</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForVisible</td> - <td>//div[@id='service']//span[@name='certificate_status']//div[@name='certificate-missing']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -62,13 +62,13 @@ <td></td> </tr> <tr> - <td>waitForVisible</td> - <td>//div[@id='service']//span[@name='certificate_status']//div[@name='certificate-valid']</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='service']//span[@name='certificate_status']//div[@name='certificate-valid']//a[@title='Get']</td> + <td>css=.entity[name='service'] span[name='certificate_status'] div[name='certificate-valid'] a[title='Get']</td> <td></td> </tr> <tr> diff --git a/install/ui/test/functional/service-del.html b/install/ui/test/functional/service-del.html index 48848e4c..4afb076d 100644 --- a/install/ui/test/functional/service-del.html +++ b/install/ui/test/functional/service-del.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=5</td> + <td>/ipa/ui/#navigation=identity&identity=service</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice//test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/service-find.html b/install/ui/test/functional/service-find.html index 27fc58fd..9783b93c 100644 --- a/install/ui/test/functional/service-find.html +++ b/install/ui/test/functional/service-find.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=5</td> + <td>/ipa/ui/#navigation=identity&identity=service</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-service-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-service-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-service-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/service-mod.html b/install/ui/test/functional/service-mod.html index 54ed8914..e78e1e69 100644 --- a/install/ui/test/functional/service-mod.html +++ b/install/ui/test/functional/service-mod.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=5</td> + <td>/ipa/ui/#navigation=identity&identity=service</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> + <td>css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/user-activation.html b/install/ui/test/functional/user-activation.html index f75616d2..1ece77eb 100644 --- a/install/ui/test/functional/user-activation.html +++ b/install/ui/test/functional/user-activation.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=0</td> + <td>/ipa/ui/#navigation=identity&identity=user</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>css=span[name=nsaccountlock] a</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -71,16 +71,6 @@ <td>css=span[name=nsaccountlock] a</td> <td>regexp:Active:.*</td> </tr> -<tr> - <td>click</td> - <td>//div[@id='user']/div[1]/ul/li[1]/span</td> - <td></td> -</tr> -<tr> - <td>waitForNotVisible</td> - <td>//span[@id='header-network-activity-indicator']</td> - <td></td> -</tr> </tbody></table> </body> </html> diff --git a/install/ui/test/functional/user-add.html b/install/ui/test/functional/user-add.html index 28e65b53..739a2254 100644 --- a/install/ui/test/functional/user-add.html +++ b/install/ui/test/functional/user-add.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=0</td> + <td>/ipa/ui/#navigation=identity&identity=user</td> <td></td> </tr> <tr> @@ -56,11 +56,6 @@ <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> -<tr> - <td>verifyElementPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> - <td></td> -</tr> </tbody></table> </body> </html> diff --git a/install/ui/test/functional/user-del.html b/install/ui/test/functional/user-del.html index 21e62245..dd349b74 100644 --- a/install/ui/test/functional/user-del.html +++ b/install/ui/test/functional/user-del.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=0</td> + <td>/ipa/ui/#navigation=identity&identity=user</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/user-find.html b/install/ui/test/functional/user-find.html index 0b065baa..b3ccfd81 100644 --- a/install/ui/test/functional/user-find.html +++ b/install/ui/test/functional/user-find.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=0</td> + <td>/ipa/ui/#navigation=identity&identity=user</td> <td></td> </tr> <tr> @@ -23,12 +23,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-user-filter</td> + <td>filter</td> <td>test</td> </tr> <tr> @@ -43,12 +43,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-user-filter</td> + <td>filter</td> <td>xxx</td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> <tr> <td>type</td> - <td>search-user-filter</td> + <td>filter</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> </tbody></table> diff --git a/install/ui/test/functional/user-mod.html b/install/ui/test/functional/user-mod.html index 21868203..347c74e1 100644 --- a/install/ui/test/functional/user-mod.html +++ b/install/ui/test/functional/user-mod.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=0</td> + <td>/ipa/ui/#navigation=identity&identity=user</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>testuser:</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -43,7 +43,7 @@ </tr> <tr> <td>click</td> - <td>link=Add</td> + <td>css=span[name=mail] a[name=add]</td> <td></td> </tr> <!--BUG: typeKeys doesn't work with "."--> @@ -58,18 +58,13 @@ <td>com</td> </tr> <tr> - <td>click</td> - <td>link=Update</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> + <td>verifyTextPresent</td> <td>undo</td> <td></td> </tr> <tr> <td>click</td> - <td>css=li.back-to-search span.input_link</td> + <td>link=Update</td> <td></td> </tr> <tr> @@ -78,9 +73,9 @@ <td></td> </tr> <tr> - <td>verifyText</td> - <td>css=table.search-table tbody tr:nth-child(2) span[name=mail]</td> - <td>testuser@example.com</td> + <td>verifyTextNotPresent</td> + <td>undo</td> + <td></td> </tr> </tbody></table> </body> diff --git a/install/ui/test/functional/user-password-reset.html b/install/ui/test/functional/user-password-reset.html index b4f1de1a..e242c85c 100644 --- a/install/ui/test/functional/user-password-reset.html +++ b/install/ui/test/functional/user-password-reset.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/#navigation=0&identity=0</td> + <td>/ipa/ui/#navigation=identity&identity=user</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td> + <td>css=.entity[name='user'] .facet[name='search'] input[value='testuser']</td> <td></td> </tr> <tr> @@ -32,8 +32,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>css=span[name=userpassword] a[title=userpassword]</td> + <td>waitForNotVisible</td> + <td>//span[@id='header-network-activity-indicator']</td> <td></td> </tr> <tr> @@ -66,16 +66,6 @@ <td>Password change complete</td> <td></td> </tr> -<tr> - <td>click</td> - <td>//div[@id='user']/div[1]/ul/li[1]/span</td> - <td></td> -</tr> -<tr> - <td>waitForNotVisible</td> - <td>//span[@id='header-network-activity-indicator']</td> - <td></td> -</tr> </tbody></table> </body> </html> |