diff --git a/install/ui/test/functional/group-add-member-user.html b/install/ui/test/functional/group-add-member-user.html index 6477e7dfc..a3d199baf 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 @@ open - /ipa/ui/#navigation=0&identity=1 + /ipa/ui/#navigation=identity&identity=group @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] @@ -32,13 +32,8 @@ - waitForTextPresent - testgroup: - - - - click - //div[@id='group']/div[1]/ul/li[4] + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -68,17 +63,7 @@ waitForElementPresent - //div[@id='group']//span[@name='association']//input[@value='testuser'] - - - - click - //div[@id='group']/div[1]/ul/li[1]/span - - - - waitForNotVisible - //span[@id='header-network-activity-indicator'] + css=.entity[name='group'] .facet[name='member_user'] input[value='testuser'] diff --git a/install/ui/test/functional/group-add.html b/install/ui/test/functional/group-add.html index 738136eac..5e94d6fb2 100644 --- a/install/ui/test/functional/group-add.html +++ b/install/ui/test/functional/group-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=1 + /ipa/ui/#navigation=identity&identity=group @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] click - //div[@id='group']/div/ul/li[1]/span/span/a[2] + link=Add @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] diff --git a/install/ui/test/functional/group-del.html b/install/ui/test/functional/group-del.html index 84074cd87..99f8c10f9 100644 --- a/install/ui/test/functional/group-del.html +++ b/install/ui/test/functional/group-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=1 + /ipa/ui/#navigation=identity&identity=group @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] @@ -33,7 +33,7 @@ click - //div[@id='group']/div/ul/li[1]/span/span/a[1] + link=Delete @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] diff --git a/install/ui/test/functional/group-find.html b/install/ui/test/functional/group-find.html index 1f9c34826..cc2f98861 100644 --- a/install/ui/test/functional/group-find.html +++ b/install/ui/test/functional/group-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=1 + /ipa/ui/#navigation=identity&identity=group @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] type - search-group-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] type - search-group-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] type - search-group-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] diff --git a/install/ui/test/functional/group-mod.html b/install/ui/test/functional/group-mod.html index 092bc921e..09ebc17f7 100644 --- a/install/ui/test/functional/group-mod.html +++ b/install/ui/test/functional/group-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=1 + /ipa/ui/#navigation=identity&identity=group @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] @@ -32,8 +32,18 @@ - waitForTextPresent - testgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + click + details + + + + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -46,13 +56,23 @@ description Test Group 123 + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -67,18 +87,13 @@ Test Group - click - link=Update - - - - waitForTextNotPresent + verifyTextPresent undo click - //div[@id='group']/div[1]/ul/li[1]/span + link=Update @@ -86,6 +101,11 @@ //span[@id='header-network-activity-indicator'] + + verifyTextNotPresent + undo + + diff --git a/install/ui/test/functional/group-remove-member-user.html b/install/ui/test/functional/group-remove-member-user.html index bd44e6439..8f653799a 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 @@ open - /ipa/ui/#navigation=0&identity=1 + /ipa/ui/#navigation=identity&identity=group @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='group']//span[@name='search']//input[@value='testgroup'] + css=.entity[name='group'] .facet[name='search'] input[value='testgroup'] @@ -32,28 +32,18 @@ - waitForTextPresent - testgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='group']/div[1]/ul/li[@title='member_user'] - - - - waitForElementPresent - //div[@id='group']//span[@name='association']//input[@value='testuser'] + css=.entity[name='group'] .facet[name='member_user'] input[value='testuser'] click - //div[@id='group']//span[@name='association']//input[@value='testuser'] - - - - click - //div[@id='group']/div[1]/ul/li[4]/ul/li[2]/span/a[1] + css=.entity[name='group'] .facet[name='member_user'] a[title='Delete'] @@ -61,21 +51,16 @@ //button[@type='button'] - - waitForElementNotPresent - //div[@id='group']/span/table/tbody/tr - - - - click - //div[@id='group']/div[1]/ul/li[1]/span - - waitForNotVisible //span[@id='header-network-activity-indicator'] + + waitForElementNotPresent + css=.entity[name='group'] .facet[name='member_user'] input[value='testuser'] + + diff --git a/install/ui/test/functional/hbacrule-activation.html b/install/ui/test/functional/hbacrule-activation.html index 30f7d6087..ec4865c62 100644 --- a/install/ui/test/functional/hbacrule-activation.html +++ b/install/ui/test/functional/hbacrule-activation.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1 + /ipa/ui/#navigation=policy&policy=hbac @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] @@ -32,8 +32,8 @@ - waitForTextPresent - testhbacrule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -41,13 +41,23 @@ //input[@name='ipaenabledflag' and @value='FALSE'] + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -56,13 +66,23 @@ ipaenabledflag + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/hbacrule-add.html b/install/ui/test/functional/hbacrule-add.html index 74e43b5a6..ad3b22664 100644 --- a/install/ui/test/functional/hbacrule-add.html +++ b/install/ui/test/functional/hbacrule-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1 + /ipa/ui/#navigation=policy&policy=hbac @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] click - //div[@id='hbacrule']//div[@class='action-panel']//a[@title='Add'] + css=.entity[name='hbacrule'] .facet[name='search'] a[title='Add'] @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] diff --git a/install/ui/test/functional/hbacrule-del.html b/install/ui/test/functional/hbacrule-del.html index c513aff9d..21bcbec41 100644 --- a/install/ui/test/functional/hbacrule-del.html +++ b/install/ui/test/functional/hbacrule-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1 + /ipa/ui/#navigation=policy&policy=hbac @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] click - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] click - //div[@id='hbacrule']//div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='hbacrule'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] diff --git a/install/ui/test/functional/hbacrule-find.html b/install/ui/test/functional/hbacrule-find.html index 236fb1ffb..20352fd43 100644 --- a/install/ui/test/functional/hbacrule-find.html +++ b/install/ui/test/functional/hbacrule-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1 + /ipa/ui/#navigation=policy&policy=hbac @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] type - search-hbacrule-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] type - search-hbacrule-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] type - search-hbacrule-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] diff --git a/install/ui/test/functional/hbacrule-host.html b/install/ui/test/functional/hbacrule-host.html index 01dbb7773..84701aa6c 100644 --- a/install/ui/test/functional/hbacrule-host.html +++ b/install/ui/test/functional/hbacrule-host.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1 + /ipa/ui/#navigation=policy&policy=hbac @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] @@ -32,13 +32,13 @@ - waitForTextPresent - testhbacrule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//a[@title='Add'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberhost_host'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com'] click - //div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com'] click - //div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//a[@title='Delete'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberhost_host'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberhost_host'] input[value='test.example.com'] diff --git a/install/ui/test/functional/hbacrule-mod.html b/install/ui/test/functional/hbacrule-mod.html index 22d46c8f3..4f1ae5053 100644 --- a/install/ui/test/functional/hbacrule-mod.html +++ b/install/ui/test/functional/hbacrule-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1 + /ipa/ui/#navigation=policy&policy=hbac @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] @@ -32,8 +32,8 @@ - waitForTextPresent - testhbacrule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -51,13 +51,23 @@ //input[@name='accessruletype' and @value='deny'] + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -76,13 +86,23 @@ accessruletype + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/hbacrule-service.html b/install/ui/test/functional/hbacrule-service.html index 7e777ea3b..b5597e573 100644 --- a/install/ui/test/functional/hbacrule-service.html +++ b/install/ui/test/functional/hbacrule-service.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1 + /ipa/ui/#navigation=policy&policy=hbac @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] @@ -32,13 +32,13 @@ - waitForTextPresent - testhbacrule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//a[@title='Add'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//input[@value='testhbacsvc'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] input[value='testhbacsvc'] click - //div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//input[@value='testhbacsvc'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] input[value='testhbacsvc'] click - //div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//a[@title='Delete'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//input[@value='testhbacsvc'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberservice_hbacsvc'] input[value='testhbacsvc'] diff --git a/install/ui/test/functional/hbacrule-sourcehost.html b/install/ui/test/functional/hbacrule-sourcehost.html index ac213f5de..f998bad3f 100644 --- a/install/ui/test/functional/hbacrule-sourcehost.html +++ b/install/ui/test/functional/hbacrule-sourcehost.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1 + /ipa/ui/#navigation=policy&policy=hbac @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] @@ -32,13 +32,13 @@ - waitForTextPresent - testhbacrule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//a[@title='Add'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//input[@value='test.example.com'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] input[value='test.example.com'] click - //div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//input[@value='test.example.com'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] input[value='test.example.com'] click - //div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//a[@title='Delete'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//input[@value='test.example.com'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='sourcehost_host'] input[value='test.example.com'] diff --git a/install/ui/test/functional/hbacrule-user.html b/install/ui/test/functional/hbacrule-user.html index 59abc848a..d8ce7984e 100644 --- a/install/ui/test/functional/hbacrule-user.html +++ b/install/ui/test/functional/hbacrule-user.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1 + /ipa/ui/#navigation=policy&policy=hbac @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule'] + css=.entity[name='hbacrule'] .facet[name='search'] input[value='testhbacrule'] @@ -32,13 +32,13 @@ - waitForTextPresent - testhbacrule: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - link=Add + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberuser_user'] a[title='Add'] @@ -68,17 +68,17 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser'] click - //div[@id='hbacrule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser'] click - link=Delete + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberuser_user'] a[title='Delete'] @@ -93,7 +93,7 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser'] + css=.entity[name='hbacrule'] .facet[name='details'] span[name='memberuser_user'] input[value='testuser'] diff --git a/install/ui/test/functional/hbacsvc-add.html b/install/ui/test/functional/hbacsvc-add.html index 98503e6e6..31e7d5ceb 100644 --- a/install/ui/test/functional/hbacsvc-add.html +++ b/install/ui/test/functional/hbacsvc-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvc + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvc @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] click - //div[@id='hbacrule']//div[@class='action-panel']//a[@title='Add'] + css=.entity[name='hbacsvc'] .facet[name='search'] a[title='Add'] @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] diff --git a/install/ui/test/functional/hbacsvc-del.html b/install/ui/test/functional/hbacsvc-del.html index 50bac348c..03edecce9 100644 --- a/install/ui/test/functional/hbacsvc-del.html +++ b/install/ui/test/functional/hbacsvc-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvc + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvc @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] click - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] click - //div[@id='hbacrule']//div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='hbacsvc'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] diff --git a/install/ui/test/functional/hbacsvc-find.html b/install/ui/test/functional/hbacsvc-find.html index 71a09f5f9..922e9ce2b 100644 --- a/install/ui/test/functional/hbacsvc-find.html +++ b/install/ui/test/functional/hbacsvc-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvc + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvc @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] type - search-hbacsvc-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] type - search-hbacsvc-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] type - search-hbacsvc-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] diff --git a/install/ui/test/functional/hbacsvc-mod.html b/install/ui/test/functional/hbacsvc-mod.html index 7b4988556..267301249 100644 --- a/install/ui/test/functional/hbacsvc-mod.html +++ b/install/ui/test/functional/hbacsvc-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvc + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvc @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvc'] .facet[name='search'] input[value='testhbacsvc'] @@ -32,8 +32,8 @@ - waitForTextPresent - testhbacsvc: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -46,13 +46,23 @@ description xxx + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -66,13 +76,23 @@ description Test HBAC Service + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/hbacsvcgroup-add-member.html b/install/ui/test/functional/hbacsvcgroup-add-member.html index a92d2a210..1adf57de7 100644 --- a/install/ui/test/functional/hbacsvcgroup-add-member.html +++ b/install/ui/test/functional/hbacsvcgroup-add-member.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] @@ -32,13 +32,13 @@ - waitForTextPresent - testhbacsvcgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - link=Add + css=.entity[name='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] a[title='Add'] @@ -68,7 +68,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] input[value='testhbacsvc'] diff --git a/install/ui/test/functional/hbacsvcgroup-add.html b/install/ui/test/functional/hbacsvcgroup-add.html index b174fad3c..b91f2eb3a 100644 --- a/install/ui/test/functional/hbacsvcgroup-add.html +++ b/install/ui/test/functional/hbacsvcgroup-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] click - //div[@id='hbacrule']//div[@class='action-panel']//a[@title='Add'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] a[title='Add'] @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] diff --git a/install/ui/test/functional/hbacsvcgroup-del.html b/install/ui/test/functional/hbacsvcgroup-del.html index bc7ade308..daac295a8 100644 --- a/install/ui/test/functional/hbacsvcgroup-del.html +++ b/install/ui/test/functional/hbacsvcgroup-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] click - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] click - //div[@id='hbacrule']//div[@class='action-panel']//a[@title='Delete'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] diff --git a/install/ui/test/functional/hbacsvcgroup-find.html b/install/ui/test/functional/hbacsvcgroup-find.html index 78d21ccb3..ec2323123 100644 --- a/install/ui/test/functional/hbacsvcgroup-find.html +++ b/install/ui/test/functional/hbacsvcgroup-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] type - search-hbacsvcgroup-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] type - search-hbacsvcgroup-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] type - search-hbacsvcgroup-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] diff --git a/install/ui/test/functional/hbacsvcgroup-mod.html b/install/ui/test/functional/hbacsvcgroup-mod.html index 4ad290097..7041c3e0a 100644 --- a/install/ui/test/functional/hbacsvcgroup-mod.html +++ b/install/ui/test/functional/hbacsvcgroup-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] @@ -32,8 +32,8 @@ - waitForTextPresent - testhbacsvcgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -46,13 +46,23 @@ description xxx + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -66,13 +76,23 @@ description Test HBAC Service Group + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo diff --git a/install/ui/test/functional/hbacsvcgroup-remove-member.html b/install/ui/test/functional/hbacsvcgroup-remove-member.html index b48e9bd60..1e85b64dc 100644 --- a/install/ui/test/functional/hbacsvcgroup-remove-member.html +++ b/install/ui/test/functional/hbacsvcgroup-remove-member.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=1&policy=1&hbacrule-entity=hbacsvcgroup + /ipa/ui/#navigation=policy&policy=hbac&hbac=hbacsvcgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup'] + css=.entity[name='hbacsvcgroup'] .facet[name='search'] input[value='testhbacsvcgroup'] @@ -32,23 +32,18 @@ - waitForTextPresent - testhbacsvcgroup: - - - - waitForElementPresent - //div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] input[value='testhbacsvc'] click - link=Delete + css=.entity[name='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] a[title='Delete'] @@ -63,7 +58,7 @@ verifyElementNotPresent - //div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc'] + css=.entity[name='hbacsvcgroup'] .facet[name='details'] span[name='member_hbacsvc'] input[value='testhbacsvc'] diff --git a/install/ui/test/functional/host-add.html b/install/ui/test/functional/host-add.html index 92657a236..a39f96e45 100644 --- a/install/ui/test/functional/host-add.html +++ b/install/ui/test/functional/host-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=2 + /ipa/ui/#navigation=identity&identity=host @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] click - //div[@id='host']/div/ul/li[1]/span/span/a[2] + link=Add @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] diff --git a/install/ui/test/functional/host-certificate.html b/install/ui/test/functional/host-certificate.html index 47f3709a2..af528edfa 100644 --- a/install/ui/test/functional/host-certificate.html +++ b/install/ui/test/functional/host-certificate.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=2 + /ipa/ui/#navigation=identity&identity=host @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] @@ -32,8 +32,8 @@ - waitForVisible - //div[@id='host']//span[@name='certificate_status']//div[@name='certificate-missing'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -63,12 +63,12 @@ waitForVisible - //div[@id='host']//span[@name='certificate_status']//div[@name='certificate-valid'] + css=.entity[name='host'] span[name='certificate_status'] div[name='certificate-valid'] click - //div[@id='host']//span[@name='certificate_status']//div[@name='certificate-valid']//a[@title='Get'] + css=.entity[name='host'] span[name='certificate_status'] div[name='certificate-valid'] a[title='Get'] @@ -111,16 +111,6 @@ css=div.ui-dialog - - click - //div[@id='host']/div[1]/ul/li[1]/span - - - - waitForElementPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] - - diff --git a/install/ui/test/functional/host-del.html b/install/ui/test/functional/host-del.html index 4516fa24e..471b4ef0e 100644 --- a/install/ui/test/functional/host-del.html +++ b/install/ui/test/functional/host-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=2 + /ipa/ui/#navigation=identity&identity=host @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] click - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] click - //div[@id='host']/div/ul/li[1]/span/span/a[1] + link=Delete @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] diff --git a/install/ui/test/functional/host-find.html b/install/ui/test/functional/host-find.html index 7d2c0030d..c04be6fd5 100644 --- a/install/ui/test/functional/host-find.html +++ b/install/ui/test/functional/host-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=2 + /ipa/ui/#navigation=identity&identity=host @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] type - search-host-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] type - search-host-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] type - search-host-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] diff --git a/install/ui/test/functional/host-mod.html b/install/ui/test/functional/host-mod.html index f1f2b2d6b..b2d64bef4 100644 --- a/install/ui/test/functional/host-mod.html +++ b/install/ui/test/functional/host-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=2 + /ipa/ui/#navigation=identity&identity=host @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + css=.entity[name='host'] .facet[name='search'] input[value='test.example.com'] @@ -32,8 +32,38 @@ - waitForElementPresent - //div[@id='host']//span[@name='fqdn'][label='test.example.com'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + type + description + + + + typeKeys + description + xxx + + + verifyTextPresent + undo + + + + click + link=Update + + + + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent + undo @@ -47,29 +77,24 @@ Test Host - click - link=Update - - - - waitForTextNotPresent + verifyTextPresent undo click - //div[@id='host']/div[1]/ul/li[1]/span + link=Update - waitForElementPresent - //div[@id='host']//span[@name='search']//input[@value='test.example.com'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] - verifyText - css=#host table.search-table tbody tr:nth-child(2) span[name=description] - Test Host + verifyTextNotPresent + undo + diff --git a/install/ui/test/functional/hostgroup-add-member-host.html b/install/ui/test/functional/hostgroup-add-member-host.html index 843bdb2eb..d8972a7d8 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 @@ open - /ipa/ui/#navigation=0&identity=3 + /ipa/ui/#navigation=identity&identity=hostgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] @@ -32,13 +32,8 @@ - waitForTextPresent - testhostgroup: - - - - click - //div[@id='hostgroup']/div[1]/ul/li[6] + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -66,21 +61,16 @@ //button[@type='button'] - - waitForElementPresent - //div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com'] - - - - click - //div[@id='hostgroup']/div[1]/ul/li[1]/span - - waitForNotVisible //span[@id='header-network-activity-indicator'] + + verifyElementPresent + css=.entity[name='hostgroup'] .facet[name='member_host'] input[value='test.example.com'] + + diff --git a/install/ui/test/functional/hostgroup-add.html b/install/ui/test/functional/hostgroup-add.html index 8188adb4c..1670f9a7f 100644 --- a/install/ui/test/functional/hostgroup-add.html +++ b/install/ui/test/functional/hostgroup-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=3 + /ipa/ui/#navigation=identity&identity=hostgroup @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] click - //div[@id='hostgroup']/div/ul/li[1]/span/span/a[2] + link=Add @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] diff --git a/install/ui/test/functional/hostgroup-del.html b/install/ui/test/functional/hostgroup-del.html index 6faa4c39b..abb0b1324 100644 --- a/install/ui/test/functional/hostgroup-del.html +++ b/install/ui/test/functional/hostgroup-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=3 + /ipa/ui/#navigation=identity&identity=hostgroup @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] click - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] click - //div[@id='hostgroup']/div/ul/li[1]/span/span/a[1] + css=.entity[name='hostgroup'] .facet[name='search'] a[title='Delete'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] diff --git a/install/ui/test/functional/hostgroup-find.html b/install/ui/test/functional/hostgroup-find.html index 13a343289..03871b08c 100644 --- a/install/ui/test/functional/hostgroup-find.html +++ b/install/ui/test/functional/hostgroup-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=3 + /ipa/ui/#navigation=identity&identity=hostgroup @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] type - search-hostgroup-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] type - search-hostgroup-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] type - search-hostgroup-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] diff --git a/install/ui/test/functional/hostgroup-mod b/install/ui/test/functional/hostgroup-mod index fd31960da..c93fa9869 100644 --- a/install/ui/test/functional/hostgroup-mod +++ b/install/ui/test/functional/hostgroup-mod @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=3 + /ipa/ui/#navigation=identity&identity=hostgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] @@ -32,8 +32,18 @@ - waitForTextPresent - testhostgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + click + link=Settings + + + + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -41,13 +51,23 @@ description xxx + + verifyTextPresent + undo + + click link=Update - waitForTextNotPresent + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyTextNotPresent undo @@ -57,18 +77,13 @@ Test Host Group - click - link=Update - - - - waitForTextNotPresent + verifyTextPresent undo click - //div[@id='hostgroup']/div[1]/ul/li[1]/span + link=Update @@ -76,6 +91,11 @@ //span[@id='header-network-activity-indicator'] + + verifyTextNotPresent + undo + + diff --git a/install/ui/test/functional/hostgroup-remove-member-host.html b/install/ui/test/functional/hostgroup-remove-member-host.html index 2ad4f4e8e..006efed8f 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 @@ open - /ipa/ui/#navigation=0&identity=3 + /ipa/ui/#navigation=identity&identity=hostgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup'] + css=.entity[name='hostgroup'] .facet[name='search'] input[value='testhostgroup'] @@ -32,28 +32,18 @@ - waitForTextPresent - testhostgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='hostgroup']/div[1]/ul/li[6] - - - - waitForElementPresent - //div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com'] + css=.entity[name='hostgroup'] .facet[name='member_host'] input[value='test.example.com'] click - //div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com'] - - - - click - //div[@id='hostgroup']/div[1]/ul/li[6]/ul/li[2]/span/a[1] + css=.entity[name='hostgroup'] .facet[name='member_host'] a[title='Delete'] @@ -61,14 +51,9 @@ //button[@type='button'] - - waitForElementNotPresent - //div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com'] - - click - //div[@id='hostgroup']/div[1]/ul/li[1]/span + //div[@id='content']/div/div[2]/div[2]/div[1]/div[2]/a[1] @@ -76,6 +61,11 @@ //span[@id='header-network-activity-indicator'] + + verifyElementNotPresent + css=.entity[name='hostgroup'] .facet[name='member_host'] input[value='test.example.com'] + + diff --git a/install/ui/test/functional/netgroup-add-member-user.html b/install/ui/test/functional/netgroup-add-member-user.html index 24718fe0e..1007ca739 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 @@ open - /ipa/ui/#navigation=0&identity=4 + /ipa/ui/#navigation=identity&identity=netgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] @@ -32,18 +32,23 @@ - waitForTextPresent - testnetgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='netgroup']/div[1]/ul/li[9] + css=.entity[name='netgroup'] li[title='memberuser_user'] a + + + + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - link=Enroll + css=.entity[name='netgroup'] .facet[name='memberuser_user'] a[title='Enroll'] @@ -67,8 +72,13 @@ - waitForElementPresent - //div[@id='netgroup']//span[@name='association']//input[@value='testuser'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyElementPresent + css=.entity[name='netgroup'] .facet[name='memberuser_user'] input[value='testuser'] diff --git a/install/ui/test/functional/netgroup-add.html b/install/ui/test/functional/netgroup-add.html index f0e3be72b..1fc58ed7f 100644 --- a/install/ui/test/functional/netgroup-add.html +++ b/install/ui/test/functional/netgroup-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=4 + /ipa/ui/#navigation=identity&identity=netgroup @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] click - //div[@id='netgroup']/div/ul/li[1]/span/span/a[2] + link=Add @@ -53,7 +53,7 @@ verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] diff --git a/install/ui/test/functional/netgroup-del.html b/install/ui/test/functional/netgroup-del.html index b949fe010..07ae31679 100644 --- a/install/ui/test/functional/netgroup-del.html +++ b/install/ui/test/functional/netgroup-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=4 + /ipa/ui/#navigation=identity&identity=netgroup @@ -23,17 +23,17 @@ verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] click - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] click - //div[@id='netgroup']/div/ul/li[1]/span/span/a[1] + link=Delete @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] diff --git a/install/ui/test/functional/netgroup-find.html b/install/ui/test/functional/netgroup-find.html index 02b4e3e4b..8f95401b7 100644 --- a/install/ui/test/functional/netgroup-find.html +++ b/install/ui/test/functional/netgroup-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=4 + /ipa/ui/#navigation=identity&identity=netgroup @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] type - search-netgroup-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] type - search-netgroup-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] type - search-netgroup-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] diff --git a/install/ui/test/functional/netgroup-mod.html b/install/ui/test/functional/netgroup-mod.html index e61c16abf..f87b111e4 100644 --- a/install/ui/test/functional/netgroup-mod.html +++ b/install/ui/test/functional/netgroup-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=4 + /ipa/ui/#navigation=identity&identity=netgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] @@ -32,8 +32,18 @@ - waitForTextPresent - testnetgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + click + link=Settings + + + + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -62,33 +72,23 @@ - waitForTextNotPresent + verifyTextPresent undo click - //div[@id='netgroup']/div[1]/ul/li[1]/span + link=Update - waitForElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] - waitForElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']/ancestor::tr//span[@name='description' and text()='xxx'] - - - - click - link=testnetgroup - - - - waitForTextPresent - testnetgroup: + verifyTextNotPresent + undo @@ -112,18 +112,13 @@ idm.lab.bos.redhat.com - click - link=Update - - - - waitForTextNotPresent + verifyTextPresent undo click - //div[@id='netgroup']/div[1]/ul/li[1]/span + link=Update @@ -132,13 +127,8 @@ - verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] - - - - verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']/ancestor::tr//span[@name='description' and text()='Test Netgroup'] + verifyTextNotPresent + undo diff --git a/install/ui/test/functional/netgroup-remove-member-user.html b/install/ui/test/functional/netgroup-remove-member-user.html index d9c1c3159..7482374f9 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 @@ open - /ipa/ui/#navigation=0&identity=4 + /ipa/ui/#navigation=identity&identity=netgroup @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup'] + css=.entity[name='netgroup'] .facet[name='search'] input[value='testnetgroup'] @@ -32,28 +32,28 @@ - waitForTextPresent - testnetgroup: + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='netgroup']/div[1]/ul/li[9] + css=.entity[name='netgroup'] li[title='memberuser_user'] a - waitForElementPresent - //div[@id='netgroup']//span[@name='association']//input[@value='testuser'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='netgroup']//span[@name='association']//input[@value='testuser'] + css=.entity[name='netgroup'] .facet[name='memberuser_user'] input[value='testuser'] click - link=Delete + css=.entity[name='netgroup'] .facet[name='memberuser_user'] a[title='Delete'] @@ -62,8 +62,13 @@ - waitForElementNotPresent - //div[@id='netgroup']//span[@name='association']//input[@value='testuser'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] + + + + verifyElementNotPresent + css=.entity[name='netgroup'] .facet[name='memberuser_user'] input[value='testuser'] diff --git a/install/ui/test/functional/service-add.html b/install/ui/test/functional/service-add.html index 42594ef26..e19702310 100644 --- a/install/ui/test/functional/service-add.html +++ b/install/ui/test/functional/service-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=5 + /ipa/ui/#navigation=identity&identity=service @@ -23,12 +23,12 @@ verifyElementNotPresent - //div[@id='service']//span[@name='search']//input[@value='testservice//test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] click - //div[@id='service']/div/ul/li[1]/span/span/a[2] + link=Add @@ -58,7 +58,7 @@ verifyElementPresent - //div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] diff --git a/install/ui/test/functional/service-certificate.html b/install/ui/test/functional/service-certificate.html index bcfce1fa8..1f33160aa 100644 --- a/install/ui/test/functional/service-certificate.html +++ b/install/ui/test/functional/service-certificate.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=5 + /ipa/ui/#navigation=identity&identity=service @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] @@ -32,8 +32,8 @@ - waitForVisible - //div[@id='service']//span[@name='certificate_status']//div[@name='certificate-missing'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -62,13 +62,13 @@ - waitForVisible - //div[@id='service']//span[@name='certificate_status']//div[@name='certificate-valid'] + waitForNotVisible + //span[@id='header-network-activity-indicator'] click - //div[@id='service']//span[@name='certificate_status']//div[@name='certificate-valid']//a[@title='Get'] + css=.entity[name='service'] span[name='certificate_status'] div[name='certificate-valid'] a[title='Get'] diff --git a/install/ui/test/functional/service-del.html b/install/ui/test/functional/service-del.html index 48848e4ca..4afb076d9 100644 --- a/install/ui/test/functional/service-del.html +++ b/install/ui/test/functional/service-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=5 + /ipa/ui/#navigation=identity&identity=service @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] click - //div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='service']//span[@name='search']//input[@value='testservice//test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] diff --git a/install/ui/test/functional/service-find.html b/install/ui/test/functional/service-find.html index 27fc58fd3..9783b93c8 100644 --- a/install/ui/test/functional/service-find.html +++ b/install/ui/test/functional/service-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=5 + /ipa/ui/#navigation=identity&identity=service @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] type - search-service-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] type - search-service-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] type - search-service-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] diff --git a/install/ui/test/functional/service-mod.html b/install/ui/test/functional/service-mod.html index 54ed89140..e78e1e693 100644 --- a/install/ui/test/functional/service-mod.html +++ b/install/ui/test/functional/service-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=5 + /ipa/ui/#navigation=identity&identity=service @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] + css=.entity[name='service'] .facet[name='search'] input[value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM'] @@ -32,8 +32,8 @@ - waitForTextPresent - testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM: + waitForNotVisible + //span[@id='header-network-activity-indicator'] diff --git a/install/ui/test/functional/user-activation.html b/install/ui/test/functional/user-activation.html index f75616d2d..1ece77eb5 100644 --- a/install/ui/test/functional/user-activation.html +++ b/install/ui/test/functional/user-activation.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=0 + /ipa/ui/#navigation=identity&identity=user @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] @@ -32,8 +32,8 @@ - waitForElementPresent - css=span[name=nsaccountlock] a + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -71,16 +71,6 @@ css=span[name=nsaccountlock] a regexp:Active:.* - - click - //div[@id='user']/div[1]/ul/li[1]/span - - - - waitForNotVisible - //span[@id='header-network-activity-indicator'] - - diff --git a/install/ui/test/functional/user-add.html b/install/ui/test/functional/user-add.html index 28e65b535..739a22547 100644 --- a/install/ui/test/functional/user-add.html +++ b/install/ui/test/functional/user-add.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=0 + /ipa/ui/#navigation=identity&identity=user @@ -56,11 +56,6 @@ //span[@id='header-network-activity-indicator'] - - verifyElementPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] - - diff --git a/install/ui/test/functional/user-del.html b/install/ui/test/functional/user-del.html index 21e622453..dd349b74d 100644 --- a/install/ui/test/functional/user-del.html +++ b/install/ui/test/functional/user-del.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=0 + /ipa/ui/#navigation=identity&identity=user @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] click - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] @@ -48,7 +48,7 @@ verifyElementNotPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] diff --git a/install/ui/test/functional/user-find.html b/install/ui/test/functional/user-find.html index 0b065baab..b3ccfd816 100644 --- a/install/ui/test/functional/user-find.html +++ b/install/ui/test/functional/user-find.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=0 + /ipa/ui/#navigation=identity&identity=user @@ -23,12 +23,12 @@ verifyElementPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] type - search-user-filter + filter test @@ -43,12 +43,12 @@ verifyElementPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] type - search-user-filter + filter xxx @@ -63,12 +63,12 @@ verifyElementNotPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] type - search-user-filter + filter @@ -83,7 +83,7 @@ verifyElementPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] diff --git a/install/ui/test/functional/user-mod.html b/install/ui/test/functional/user-mod.html index 218682039..347c74e12 100644 --- a/install/ui/test/functional/user-mod.html +++ b/install/ui/test/functional/user-mod.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=0 + /ipa/ui/#navigation=identity&identity=user @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] @@ -32,8 +32,8 @@ - waitForTextPresent - testuser: + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -43,7 +43,7 @@ click - link=Add + css=span[name=mail] a[name=add] @@ -58,18 +58,13 @@ com - click - link=Update - - - - waitForTextNotPresent + verifyTextPresent undo click - css=li.back-to-search span.input_link + link=Update @@ -78,9 +73,9 @@ - verifyText - css=table.search-table tbody tr:nth-child(2) span[name=mail] - testuser@example.com + verifyTextNotPresent + undo + diff --git a/install/ui/test/functional/user-password-reset.html b/install/ui/test/functional/user-password-reset.html index b4f1de1a5..e242c85c3 100644 --- a/install/ui/test/functional/user-password-reset.html +++ b/install/ui/test/functional/user-password-reset.html @@ -13,7 +13,7 @@ open - /ipa/ui/#navigation=0&identity=0 + /ipa/ui/#navigation=identity&identity=user @@ -23,7 +23,7 @@ verifyElementPresent - //div[@id='user']//span[@name='search']//input[@value='testuser'] + css=.entity[name='user'] .facet[name='search'] input[value='testuser'] @@ -32,8 +32,8 @@ - waitForElementPresent - css=span[name=userpassword] a[title=userpassword] + waitForNotVisible + //span[@id='header-network-activity-indicator'] @@ -66,16 +66,6 @@ Password change complete - - click - //div[@id='user']/div[1]/ul/li[1]/span - - - - waitForNotVisible - //span[@id='header-network-activity-indicator'] - -