diff --git a/install/ui/test/functional/krbtpolicy-mod.html b/install/ui/test/functional/krbtpolicy-mod.html
index e10406701..ab46ecb8c 100644
--- a/install/ui/test/functional/krbtpolicy-mod.html
+++ b/install/ui/test/functional/krbtpolicy-mod.html
@@ -13,7 +13,7 @@
| open |
- /ipa/ui/#navigation=2&role-entity=permission |
+ /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission |
|
@@ -23,12 +23,12 @@
| verifyElementNotPresent |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
| click |
- //div[@id='role']/div[@class='action-panel']//a[@title='Add'] |
+ css=.entity[name='role'] .facet[name='search'] a[title='Add'] |
|
@@ -68,7 +68,7 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
diff --git a/install/ui/test/functional/permission-del.html b/install/ui/test/functional/permission-del.html
index 5822d3e2e..71092feb8 100644
--- a/install/ui/test/functional/permission-del.html
+++ b/install/ui/test/functional/permission-del.html
@@ -13,7 +13,7 @@
| open |
- /ipa/ui/#navigation=2&role-entity=permission |
+ /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission |
|
@@ -23,17 +23,17 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
| click |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
| click |
- //div[@id='role']/div[@class='action-panel']//a[@title='Delete'] |
+ css=.entity[name='role'] .facet[name='search'] a[title='Delete'] |
|
@@ -48,7 +48,7 @@
| verifyElementNotPresent |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
diff --git a/install/ui/test/functional/permission-find.html b/install/ui/test/functional/permission-find.html
index d9330a481..d68588794 100644
--- a/install/ui/test/functional/permission-find.html
+++ b/install/ui/test/functional/permission-find.html
@@ -13,7 +13,7 @@
| open |
- /ipa/ui/#navigation=2&role-entity=permission |
+ /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission |
|
@@ -23,12 +23,12 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
| type |
- search-permission-filter |
+ filter |
test |
@@ -43,12 +43,12 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
| type |
- search-permission-filter |
+ filter |
xxx |
@@ -63,12 +63,12 @@
| verifyElementNotPresent |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
| type |
- search-permission-filter |
+ filter |
|
@@ -83,7 +83,7 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
diff --git a/install/ui/test/functional/permission-mod.html b/install/ui/test/functional/permission-mod.html
index 24022a19b..0515bf11a 100644
--- a/install/ui/test/functional/permission-mod.html
+++ b/install/ui/test/functional/permission-mod.html
@@ -13,7 +13,7 @@
| open |
- /ipa/ui/#navigation=2&role-entity=permission |
+ /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=permission |
|
@@ -23,7 +23,7 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testpermission'] |
+ css=.entity[name='role'] .facet[name='search'] input[value='testpermission'] |
|
@@ -38,62 +38,77 @@
| click |
- //div[@id='role']//span[@name='permissions']//input[@value='add'] |
+ css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='add'] |
|
| click |
- //div[@id='role']//span[@name='permissions']//input[@value='delete'] |
+ css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='delete'] |
|
| click |
- //div[@id='role']//span[@name='permissions']//input[@value='write'] |
+ css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='write'] |
|
| click |
- //div[@id='role']//dd[@name='attrs']//input[@value='cn'] |
+ css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='cn'] |
|
| click |
- //div[@id='role']//dd[@name='attrs']//input[@value='description'] |
+ css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='description'] |
|
- | click |
- link=Update |
- |
-
-
- | waitForTextNotPresent |
+ verifyTextPresent |
undo |
|
| click |
- //div[@id='role']//span[@name='permissions']//input[@value='write'] |
+ link=Update |
+ |
+
+
+ | waitForNotVisible |
+ //span[@id='header-network-activity-indicator'] |
+ |
+
+
+ | verifyTextNotPresent |
+ undo |
|
| click |
- //div[@id='role']//span[@name='permissions']//input[@value='add'] |
+ css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='write'] |
|
| click |
- //div[@id='role']//span[@name='permissions']//input[@value='delete'] |
+ css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='add'] |
|
| click |
- //div[@id='role']//dd[@name='attrs']//input[@value='cn'] |
+ css=.entity[name='role'] .facet[name='details'] span[name='permissions'] input[value='delete'] |
|
| click |
- //div[@id='role']//dd[@name='attrs']//input[@value='description'] |
+ css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='cn'] |
+ |
+
+
+ | click |
+ css=.entity[name='role'] .facet[name='details'] dd[name='attrs'] input[value='description'] |
+ |
+
+
+ | verifyTextPresent |
+ undo |
|
@@ -102,7 +117,12 @@
|
- | waitForTextNotPresent |
+ waitForNotVisible |
+ //span[@id='header-network-activity-indicator'] |
+ |
+
+
+ | verifyTextNotPresent |
undo |
|
diff --git a/install/ui/test/functional/privilege-add.html b/install/ui/test/functional/privilege-add.html
index 7d68046fa..6f7e7a9fa 100644
--- a/install/ui/test/functional/privilege-add.html
+++ b/install/ui/test/functional/privilege-add.html
@@ -13,7 +13,7 @@
| open |
- /ipa/ui/#navigation=2&role-entity=privilege |
+ /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege |
|
@@ -23,12 +23,12 @@
| verifyElementNotPresent |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
| click |
- //div[@id='role']/div[@class='action-panel']//a[@title='Add'] |
+ css=.entity[name='privilege'] .facet[name='search'] a[title='Add'] |
|
@@ -53,7 +53,7 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
diff --git a/install/ui/test/functional/privilege-del.html b/install/ui/test/functional/privilege-del.html
index 7a069effc..e4575ea9f 100644
--- a/install/ui/test/functional/privilege-del.html
+++ b/install/ui/test/functional/privilege-del.html
@@ -13,7 +13,7 @@
| open |
- /ipa/ui/#navigation=2&role-entity=privilege |
+ /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege |
|
@@ -23,17 +23,17 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
| click |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
| click |
- //div[@id='role']/div[@class='action-panel']//a[@title='Delete'] |
+ css=.entity[name='privilege'] .facet[name='search'] a[title='Delete'] |
|
@@ -48,7 +48,7 @@
| verifyElementNotPresent |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
diff --git a/install/ui/test/functional/privilege-find.html b/install/ui/test/functional/privilege-find.html
index 8161b7697..5410313d9 100644
--- a/install/ui/test/functional/privilege-find.html
+++ b/install/ui/test/functional/privilege-find.html
@@ -13,7 +13,7 @@
| open |
- /ipa/ui/#navigation=2&role-entity=privilege |
+ /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege |
|
@@ -23,12 +23,12 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
| type |
- search-privilege-filter |
+ filter |
test |
@@ -43,12 +43,12 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
| type |
- search-privilege-filter |
+ filter |
xxx |
@@ -63,12 +63,12 @@
| verifyElementNotPresent |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
| type |
- search-privilege-filter |
+ filter |
|
@@ -83,7 +83,7 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
diff --git a/install/ui/test/functional/privilege-mod.html b/install/ui/test/functional/privilege-mod.html
index b29728763..54894a109 100644
--- a/install/ui/test/functional/privilege-mod.html
+++ b/install/ui/test/functional/privilege-mod.html
@@ -13,7 +13,7 @@
| open |
- /ipa/ui/#navigation=2&role-entity=privilege |
+ /ipa/ui/#navigation=ipaserver&ipaserver=rolebased&rolebased=privilege |
|
@@ -23,7 +23,7 @@
| verifyElementPresent |
- //div[@id='role']//span[@name='search']//input[@value='testprivilege'] |
+ css=.entity[name='privilege'] .facet[name='search'] input[value='testprivilege'] |
|
@@ -36,6 +36,16 @@
| //span[@id='header-network-activity-indicator'] |
|
+
+ | click |
+ details |
+ |
+
+
+ | waitForNotVisible |
+ //span[@id='header-network-activity-indicator'] |
+ |
+
| type |
description |
@@ -46,6 +56,11 @@
description |
xxx |
+
+ | verifyTextPresent |
+ undo |
+ |
+
| click |
link=Update |
@@ -56,6 +71,11 @@
//span[@id='header-network-activity-indicator'] |
|
+
+ | verifyTextNotPresent |
+ undo |
+ |
+
| type |
description |
@@ -66,6 +86,11 @@
description |
Test Privilege |
+
+ | verifyTextPresent |
+ undo |
+ |
+
| click |
link=Update |
@@ -76,6 +101,11 @@
//span[@id='header-network-activity-indicator'] |
|
+
+ | verifyTextNotPresent |
+ undo |
+ |
+