diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2011-03-15 18:38:43 -0400 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2011-03-21 15:57:10 -0400 |
| commit | d40e1f3a7fceb834a38913269a49de6a4ac5fe88 (patch) | |
| tree | 8e4ce01c269e6b17871edd85ffcbafba8b7d8b16 | |
| parent | b4ad486c7aafd29ec842d75588f9f40c770edab5 (diff) | |
| download | freeipa-d40e1f3a7fceb834a38913269a49de6a4ac5fe88.tar.gz freeipa-d40e1f3a7fceb834a38913269a49de6a4ac5fe88.tar.xz freeipa-d40e1f3a7fceb834a38913269a49de6a4ac5fe88.zip | |
Invoke open at the beginning of each test case.
22 files changed, 225 insertions, 142 deletions
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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Add Member User</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=1</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>4 groups matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=testgroup</td> <td></td> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="https://localhost/" /> -<title>Add User</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">Add User</td></tr> -</thead><tbody> -<tr> - <td>click</td> - <td>link=Users</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>1 user matched</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>link=Add</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>uid</td> - <td>testuser</td> -</tr> -<tr> - <td>type</td> - <td>givenname</td> - <td>Test</td> -</tr> -<tr> - <td>type</td> - <td>sn</td> - <td>User</td> -</tr> -<tr> - <td>click</td> - <td>//button[@type='button']</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>2 users matched</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>link=User Groups</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>4 groups matched</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> 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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Add Group</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=1</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>3 groups matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>//div[@id='group']/div/ul/li[1]/span/span/a[2]</td> <td></td> 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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Delete Group</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=1</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>4 groups matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>//input[@name='select' and @value='testgroup']</td> <td></td> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="https://localhost/" /> -<title>Delete User</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">Delete User</td></tr> -</thead><tbody> -<tr> - <td>click</td> - <td>link=Users</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>2 users matched</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//input[@name='select' and @value='testuser']</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>link=Delete</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//button[@type='button']</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>1 user matched</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>link=User Groups</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>4 groups matched</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/</td> + <td>/ipa/ui/#navigation=0&identity=1</td> <td></td> </tr> <tr> <td>waitForTextPresent</td> - <td>1 user matched</td> + <td>4 groups matched</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>search-group-filter</td> + <td>testgroup</td> +</tr> +<tr> + <td>click</td> + <td>link=Find</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>1 group matched</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>search-group-filter</td> <td></td> </tr> <tr> <td>click</td> - <td>link=User Groups</td> + <td>//div[@id='group']/span/div[1]/span[1]/a/span</td> <td></td> </tr> <tr> <td>waitForTextPresent</td> - <td>3 groups matched</td> + <td>4 groups matched</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 70b149c4..bc810408 100644 --- a/install/ui/test/functional/group-mod.html +++ b/install/ui/test/functional/group-mod.html @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Edit Group</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=1</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>4 groups matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=testgroup</td> <td></td> diff --git a/install/ui/test/functional/group-delete-member-user.html b/install/ui/test/functional/group-remove-member-user.html index 10476f11..9b37afcb 100755 --- a/install/ui/test/functional/group-delete-member-user.html +++ b/install/ui/test/functional/group-remove-member-user.html @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Delete Member User</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=1</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>4 groups matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=testgroup</td> <td></td> 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 @@ <body> <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody> <tr><td><b>Test Suite</b></td></tr> -<tr><td><a href="group-find.html">View Groups</a></td></tr> <tr><td><a href="group-add.html">Add Group</a></td></tr> +<tr><td><a href="group-find.html">Search Group</a></td></tr> <tr><td><a href="group-mod.html">Edit Group</a></td></tr> -<tr><td><a href="group-add-user.html">Add User</a></td></tr> +<tr><td><a href="user-add.html">Add User</a></td></tr> <tr><td><a href="group-add-member-user.html">Add Member User</a></td></tr> -<tr><td><a href="group-delete-member-user.html">Delete Member User</a></td></tr> -<tr><td><a href="group-delete-user.html">Delete User</a></td></tr> +<tr><td><a href="group-remove-member-user.html">Delete Member User</a></td></tr> +<tr><td><a href="user-del.html">Delete User</a></td></tr> <tr><td><a href="group-del.html">Delete Group</a></td></tr> </tbody></table> </body> 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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Add Host</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=2</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>1 host matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>//div[@id='host']/div/ul/li[1]/span/span/a[2]</td> <td></td> @@ -36,7 +46,6 @@ <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-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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Host Certificate</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=2</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 hosts matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=test.example.com</td> <td></td> diff --git a/install/ui/test/functional/host-delete.html b/install/ui/test/functional/host-del.html index 6d9ed4f3..38554bac 100644 --- a/install/ui/test/functional/host-delete.html +++ b/install/ui/test/functional/host-del.html @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Delete Host</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=2</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 hosts matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>//input[@name='select' and @value='test.example.com']</td> <td></td> @@ -31,7 +41,6 @@ <td>1 host matched</td> <td></td> </tr> - </tbody></table> </body> </html> 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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Edit Host</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=2</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 hosts matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=test.example.com</td> <td></td> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/</td> + <td>/ipa/ui/#navigation=0&identity=2</td> <td></td> </tr> <tr> <td>waitForTextPresent</td> - <td>1 user matched</td> + <td>2 hosts matched</td> <td></td> </tr> <tr> + <td>type</td> + <td>search-host-filter</td> + <td>test</td> +</tr> +<tr> <td>click</td> - <td>link=Hosts</td> + <td>link=Find</td> <td></td> </tr> <tr> @@ -31,7 +36,21 @@ <td>1 host matched</td> <td></td> </tr> - +<tr> + <td>type</td> + <td>search-host-filter</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Find</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 hosts matched</td> + <td></td> +</tr> </tbody></table> </body> </html> 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 @@ <body> <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody> <tr><td><b>Test Suite</b></td></tr> -<tr><td><a href="host-find.html">View Hosts</a></td></tr> <tr><td><a href="host-add.html">Add Host</a></td></tr> +<tr><td><a href="host-find.html">Search Host</a></td></tr> <tr><td><a href="host-edit.html">Edit Host</a></td></tr> <tr><td><a href="host-certificate.html">Host Certificate</a></td></tr> -<tr><td><a href="host-delete.html">Delete Host</a></td></tr> +<tr><td><a href="host-del.html">Delete Host</a></td></tr> </tbody></table> </body> </html> 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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Activate User</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=0</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 users matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=testuser</td> <td></td> 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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Add user</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=0</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>1 user matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Add</td> <td></td> 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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Delete User</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=0</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 users matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>//input[@name='select' and @value='testuser']</td> <td></td> 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 @@ </thead><tbody> <tr> <td>open</td> - <td>/ipa/ui/</td> + <td>/ipa/ui/#navigation=0&identity=0</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 users matched</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>search-user-filter</td> + <td>testuser</td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='user']/span/div[1]/span[1]/a/span</td> <td></td> </tr> <tr> @@ -21,6 +36,21 @@ <td>1 user matched</td> <td></td> </tr> +<tr> + <td>type</td> + <td>search-user-filter</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='user']/span/div[1]/span[1]/a/span</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 users matched</td> + <td></td> +</tr> </tbody></table> </body> </html> 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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Edit user</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=0</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 users matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=testuser</td> <td></td> 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 @@ -12,6 +12,16 @@ <tr><td rowspan="1" colspan="3">Password Reset</td></tr> </thead><tbody> <tr> + <td>open</td> + <td>/ipa/ui/#navigation=0&identity=0</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>2 users matched</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=testuser</td> <td></td> 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 @@ <body> <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody> <tr><td><b>Test Suite</b></td></tr> -<tr><td><a href="user-find.html">View Users</a></td></tr> <tr><td><a href="user-add.html">Add User</a></td></tr> +<tr><td><a href="user-find.html">Search User</a></td></tr> <tr><td><a href="user-mod.html">Edit User</a></td></tr> <tr><td><a href="user-activation.html">User Activation</a></td></tr> <tr><td><a href="user-password-reset.html">Password Reset</a></td></tr> |