From d40e1f3a7fceb834a38913269a49de6a4ac5fe88 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 15 Mar 2011 18:38:43 -0400 Subject: Invoke open at the beginning of each test case. --- .../ui/test/functional/group-add-member-user.html | 10 +++ install/ui/test/functional/group-add-user.html | 67 ------------------- install/ui/test/functional/group-add.html | 10 +++ install/ui/test/functional/group-del.html | 10 +++ .../test/functional/group-delete-member-user.html | 66 ------------------- install/ui/test/functional/group-delete-user.html | 57 ---------------- install/ui/test/functional/group-find.html | 28 ++++++-- install/ui/test/functional/group-mod.html | 10 +++ .../test/functional/group-remove-member-user.html | 76 ++++++++++++++++++++++ install/ui/test/functional/groups.html | 8 +-- install/ui/test/functional/host-add.html | 11 +++- install/ui/test/functional/host-certificate.html | 10 +++ install/ui/test/functional/host-del.html | 46 +++++++++++++ install/ui/test/functional/host-delete.html | 37 ----------- install/ui/test/functional/host-edit.html | 10 +++ install/ui/test/functional/host-find.html | 27 ++++++-- install/ui/test/functional/hosts.html | 4 +- install/ui/test/functional/user-activation.html | 10 +++ install/ui/test/functional/user-add.html | 10 +++ install/ui/test/functional/user-del.html | 10 +++ install/ui/test/functional/user-find.html | 32 ++++++++- install/ui/test/functional/user-mod.html | 10 +++ .../ui/test/functional/user-password-reset.html | 10 +++ install/ui/test/functional/users.html | 2 +- 24 files changed, 327 insertions(+), 244 deletions(-) delete mode 100755 install/ui/test/functional/group-add-user.html delete mode 100755 install/ui/test/functional/group-delete-member-user.html delete mode 100755 install/ui/test/functional/group-delete-user.html create mode 100755 install/ui/test/functional/group-remove-member-user.html create mode 100644 install/ui/test/functional/host-del.html delete mode 100644 install/ui/test/functional/host-delete.html (limited to 'install/ui') diff --git a/install/ui/test/functional/group-add-member-user.html b/install/ui/test/functional/group-add-member-user.html index c7ae7725..b0b18f35 100755 --- a/install/ui/test/functional/group-add-member-user.html +++ b/install/ui/test/functional/group-add-member-user.html @@ -11,6 +11,16 @@ Add Member User + + open + /ipa/ui/#navigation=0&identity=1 + + + + waitForTextPresent + 4 groups matched + + click link=testgroup diff --git a/install/ui/test/functional/group-add-user.html b/install/ui/test/functional/group-add-user.html deleted file mode 100755 index ae08d492..00000000 --- a/install/ui/test/functional/group-add-user.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - -Add User - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Add User
clicklink=Users
waitForTextPresent1 user matched
clicklink=Add
typeuidtestuser
typegivennameTest
typesnUser
click//button[@type='button']
waitForTextPresent2 users matched
clicklink=User Groups
waitForTextPresent4 groups matched
- - diff --git a/install/ui/test/functional/group-add.html b/install/ui/test/functional/group-add.html index ba9c6005..6d59588d 100644 --- a/install/ui/test/functional/group-add.html +++ b/install/ui/test/functional/group-add.html @@ -11,6 +11,16 @@ Add Group + + open + /ipa/ui/#navigation=0&identity=1 + + + + waitForTextPresent + 3 groups matched + + click //div[@id='group']/div/ul/li[1]/span/span/a[2] diff --git a/install/ui/test/functional/group-del.html b/install/ui/test/functional/group-del.html index cc8c3884..a05f52cf 100644 --- a/install/ui/test/functional/group-del.html +++ b/install/ui/test/functional/group-del.html @@ -11,6 +11,16 @@ Delete Group + + open + /ipa/ui/#navigation=0&identity=1 + + + + waitForTextPresent + 4 groups matched + + click //input[@name='select' and @value='testgroup'] diff --git a/install/ui/test/functional/group-delete-member-user.html b/install/ui/test/functional/group-delete-member-user.html deleted file mode 100755 index 10476f11..00000000 --- a/install/ui/test/functional/group-delete-member-user.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - -Delete Member User - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Delete Member User
clicklink=testgroup
waitForTextPresenttestgroup:
click//div[@id='group']/div[1]/ul/li[@title='member_user']
waitForElementPresent//div[@id='group']/span[@name='association']//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]
click//button[@type='button']
waitForElementNotPresent//div[@id='group']/span/table/tbody/tr
click//div[@id='group']/div[1]/ul/li[1]/span
waitForTextPresent4 groups matched
- - diff --git a/install/ui/test/functional/group-delete-user.html b/install/ui/test/functional/group-delete-user.html deleted file mode 100755 index 548f46f0..00000000 --- a/install/ui/test/functional/group-delete-user.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - -Delete User - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Delete User
clicklink=Users
waitForTextPresent2 users matched
click//input[@name='select' and @value='testuser']
clicklink=Delete
click//button[@type='button']
waitForTextPresent1 user matched
clicklink=User Groups
waitForTextPresent4 groups matched
- - diff --git a/install/ui/test/functional/group-find.html b/install/ui/test/functional/group-find.html index edf9c9f7..ebc5624d 100644 --- a/install/ui/test/functional/group-find.html +++ b/install/ui/test/functional/group-find.html @@ -13,22 +13,42 @@ open - /ipa/ui/ + /ipa/ui/#navigation=0&identity=1 waitForTextPresent - 1 user matched + 4 groups matched + + + + type + search-group-filter + testgroup + + + click + link=Find + + + + waitForTextPresent + 1 group matched + + + + type + search-group-filter click - link=User Groups + //div[@id='group']/span/div[1]/span[1]/a/span waitForTextPresent - 3 groups matched + 4 groups matched diff --git a/install/ui/test/functional/group-mod.html b/install/ui/test/functional/group-mod.html index 70b149c4..bc810408 100644 --- a/install/ui/test/functional/group-mod.html +++ b/install/ui/test/functional/group-mod.html @@ -11,6 +11,16 @@ Edit Group + + open + /ipa/ui/#navigation=0&identity=1 + + + + waitForTextPresent + 4 groups matched + + click link=testgroup diff --git a/install/ui/test/functional/group-remove-member-user.html b/install/ui/test/functional/group-remove-member-user.html new file mode 100755 index 00000000..9b37afcb --- /dev/null +++ b/install/ui/test/functional/group-remove-member-user.html @@ -0,0 +1,76 @@ + + + + + + +Delete Member User + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Delete Member User
open/ipa/ui/#navigation=0&identity=1
waitForTextPresent4 groups matched
clicklink=testgroup
waitForTextPresenttestgroup:
click//div[@id='group']/div[1]/ul/li[@title='member_user']
waitForElementPresent//div[@id='group']/span[@name='association']//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]
click//button[@type='button']
waitForElementNotPresent//div[@id='group']/span/table/tbody/tr
click//div[@id='group']/div[1]/ul/li[1]/span
waitForTextPresent4 groups matched
+ + diff --git a/install/ui/test/functional/groups.html b/install/ui/test/functional/groups.html index 6f23bb55..493d9091 100644 --- a/install/ui/test/functional/groups.html +++ b/install/ui/test/functional/groups.html @@ -8,13 +8,13 @@ - + - + - - + +
Test Suite
View Groups
Add Group
Search Group
Edit Group
Add User
Add User
Add Member User
Delete Member User
Delete User
Delete Member User
Delete User
Delete Group
diff --git a/install/ui/test/functional/host-add.html b/install/ui/test/functional/host-add.html index 42a0b2fc..9ea659b1 100644 --- a/install/ui/test/functional/host-add.html +++ b/install/ui/test/functional/host-add.html @@ -11,6 +11,16 @@ Add Host + + open + /ipa/ui/#navigation=0&identity=2 + + + + waitForTextPresent + 1 host matched + + click //div[@id='host']/div/ul/li[1]/span/span/a[2] @@ -36,7 +46,6 @@ //div[@id='host']/span[@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 f35fac6a..3931204e 100644 --- a/install/ui/test/functional/host-certificate.html +++ b/install/ui/test/functional/host-certificate.html @@ -11,6 +11,16 @@ Host Certificate + + open + /ipa/ui/#navigation=0&identity=2 + + + + waitForTextPresent + 2 hosts matched + + click link=test.example.com diff --git a/install/ui/test/functional/host-del.html b/install/ui/test/functional/host-del.html new file mode 100644 index 00000000..38554bac --- /dev/null +++ b/install/ui/test/functional/host-del.html @@ -0,0 +1,46 @@ + + + + + + +Delete Host + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Delete Host
open/ipa/ui/#navigation=0&identity=2
waitForTextPresent2 hosts matched
click//input[@name='select' and @value='test.example.com']
click//div[@id='host']/div/ul/li[1]/span/span/a[1]
click//button[@type='button']
waitForTextPresent1 host matched
+ + diff --git a/install/ui/test/functional/host-delete.html b/install/ui/test/functional/host-delete.html deleted file mode 100644 index 6d9ed4f3..00000000 --- a/install/ui/test/functional/host-delete.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - -Delete Host - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Delete Host
click//input[@name='select' and @value='test.example.com']
click//div[@id='host']/div/ul/li[1]/span/span/a[1]
click//button[@type='button']
waitForTextPresent1 host matched
- - diff --git a/install/ui/test/functional/host-edit.html b/install/ui/test/functional/host-edit.html index 9d9b09d4..773a9e82 100644 --- a/install/ui/test/functional/host-edit.html +++ b/install/ui/test/functional/host-edit.html @@ -11,6 +11,16 @@ Edit Host + + open + /ipa/ui/#navigation=0&identity=2 + + + + waitForTextPresent + 2 hosts matched + + click link=test.example.com diff --git a/install/ui/test/functional/host-find.html b/install/ui/test/functional/host-find.html index 735e30ce..cb9235d7 100644 --- a/install/ui/test/functional/host-find.html +++ b/install/ui/test/functional/host-find.html @@ -13,17 +13,22 @@ open - /ipa/ui/ + /ipa/ui/#navigation=0&identity=2 waitForTextPresent - 1 user matched + 2 hosts matched + + type + search-host-filter + test + click - link=Hosts + link=Find @@ -31,7 +36,21 @@ 1 host matched - + + type + search-host-filter + + + + click + link=Find + + + + waitForTextPresent + 2 hosts matched + + diff --git a/install/ui/test/functional/hosts.html b/install/ui/test/functional/hosts.html index b7ae81b4..fd984eeb 100644 --- a/install/ui/test/functional/hosts.html +++ b/install/ui/test/functional/hosts.html @@ -8,11 +8,11 @@ - + - +
Test Suite
View Hosts
Add Host
Search Host
Edit Host
Host Certificate
Delete Host
Delete Host
diff --git a/install/ui/test/functional/user-activation.html b/install/ui/test/functional/user-activation.html index 9bf3a2a2..6110311f 100644 --- a/install/ui/test/functional/user-activation.html +++ b/install/ui/test/functional/user-activation.html @@ -11,6 +11,16 @@ Activate User + + open + /ipa/ui/#navigation=0&identity=0 + + + + waitForTextPresent + 2 users matched + + click link=testuser diff --git a/install/ui/test/functional/user-add.html b/install/ui/test/functional/user-add.html index 26c17094..d5a22679 100644 --- a/install/ui/test/functional/user-add.html +++ b/install/ui/test/functional/user-add.html @@ -11,6 +11,16 @@ Add user + + open + /ipa/ui/#navigation=0&identity=0 + + + + waitForTextPresent + 1 user matched + + click link=Add diff --git a/install/ui/test/functional/user-del.html b/install/ui/test/functional/user-del.html index 4c8f1e69..3d126760 100644 --- a/install/ui/test/functional/user-del.html +++ b/install/ui/test/functional/user-del.html @@ -11,6 +11,16 @@ Delete User + + open + /ipa/ui/#navigation=0&identity=0 + + + + waitForTextPresent + 2 users matched + + click //input[@name='select' and @value='testuser'] diff --git a/install/ui/test/functional/user-find.html b/install/ui/test/functional/user-find.html index dc245b23..8d4b588a 100644 --- a/install/ui/test/functional/user-find.html +++ b/install/ui/test/functional/user-find.html @@ -13,7 +13,22 @@ open - /ipa/ui/ + /ipa/ui/#navigation=0&identity=0 + + + + waitForTextPresent + 2 users matched + + + + type + search-user-filter + testuser + + + click + //div[@id='user']/span/div[1]/span[1]/a/span @@ -21,6 +36,21 @@ 1 user matched + + type + search-user-filter + + + + click + //div[@id='user']/span/div[1]/span[1]/a/span + + + + waitForTextPresent + 2 users matched + + diff --git a/install/ui/test/functional/user-mod.html b/install/ui/test/functional/user-mod.html index 746f977a..25643615 100644 --- a/install/ui/test/functional/user-mod.html +++ b/install/ui/test/functional/user-mod.html @@ -11,6 +11,16 @@ Edit user + + open + /ipa/ui/#navigation=0&identity=0 + + + + waitForTextPresent + 2 users matched + + click link=testuser diff --git a/install/ui/test/functional/user-password-reset.html b/install/ui/test/functional/user-password-reset.html index bc6c783d..4ca6891a 100644 --- a/install/ui/test/functional/user-password-reset.html +++ b/install/ui/test/functional/user-password-reset.html @@ -11,6 +11,16 @@ Password Reset + + open + /ipa/ui/#navigation=0&identity=0 + + + + waitForTextPresent + 2 users matched + + click link=testuser diff --git a/install/ui/test/functional/users.html b/install/ui/test/functional/users.html index 7d18ad24..0767088f 100644 --- a/install/ui/test/functional/users.html +++ b/install/ui/test/functional/users.html @@ -8,8 +8,8 @@ - + -- cgit
Test Suite
View Users
Add User
Search User
Edit User
User Activation
Password Reset