Holly fixed editing conflict error.

This commit is contained in:
hlm7 2010-06-04 19:08:51 +00:00
parent 5791cab2a4
commit 9da69c10aa

View file

@ -1,223 +1,220 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case"> <head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="" /> <link rel="selenium.base" href="" />
<title>DeleteTestFacultyMember</title> <title>DeleteTestFacultyMember</title>
<style type="text/css"> <style type="text/css">
.testName { .testName {
color: blue; color: blue;
background: rgb(80%, 80%, 80%); background: rgb(80%, 80%, 80%);
font-family: sans-serif; font-family: sans-serif;
font-weight: bold; font-weight: bold;
font-size: larger; font-size: larger;
text-align: center; text-align: center;
} }
.comment { .comment {
color: blue; color: blue;
background: rgb(80%, 80%, 80%); background: rgb(80%, 80%, 80%);
font-family: sans-serif; font-family: sans-serif;
font-weight: bold; font-weight: bold;
font-size: larger; font-size: larger;
text-align: center; text-align: center;
} }
</style> </style>
</head> </head>
<body> <body>
<table cellpadding="1" cellspacing="1" border="1"> <table cellpadding="1" cellspacing="1" border="1">
<thead> <thead>
<tr><td rowspan="1" colspan="3" class="testName">DeleteTestFacultyMember</td></tr> <tr><td rowspan="1" colspan="3" class="testName">DeleteTestFacultyMember</td></tr>
</thead><tbody> </thead><tbody>
<tr> <tr>
<td>comment</td> <td>comment</td>
<td class="comment">Delete test person Jane Faculty</td> <td class="comment">Delete test person Jane Faculty</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>deleteAllVisibleCookies</td> <td>deleteAllVisibleCookies</td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>setTimeout</td> <td>setTimeout</td>
<td>100000</td> <td>100000</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>/vivo/</td> <td>/vivo/</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>VIVO</td> <td>VIVO</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>comment</td> <td>comment</td>
<td class="comment">Must not be logged in</td> <td class="comment">Must not be logged in</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=Log in</td> <td>link=Log in</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>VIVO Site Administration</td> <td>VIVO Site Administration</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>comment</td> <td>comment</td>
<td class="comment">Must log in as site admin</td> <td class="comment">Must log in as site admin</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>username</td> <td>username</td>
<td>testAdmin</td> <td>testAdmin</td>
</tr> </tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>password</td> <td>password</td>
<td>Password</td> <td>Password</td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>loginSubmitMode</td> <td>loginSubmitMode</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>VIVO Site Administration</td> <td>VIVO Site Administration</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=Index</td> <td>link=Index</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Index to VIVO Contents</td> <td>Index to VIVO Contents</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>comment</td> <td>comment</td>
<td class="comment">Navigate to Jane Faculty</td> <td class="comment">Navigate to Jane Faculty</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=Faculty Member</td> <td>link=Faculty Member</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Faculty Member</td> <td>Faculty Member</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=Jane Faculty</td> <td>link=Jane Faculty</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Jane Faculty</td> <td>Jane Faculty</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=edit this individual</td> <td>link=edit this individual</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>comment</td> <td>comment</td>
<td class="comment">Delete Jane Faculty</td> <td class="comment">Delete Jane Faculty</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Individual Control Panel</td> <td>Individual Control Panel</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>//input[@value='Edit This Individual']</td> <td>//input[@value='Edit This Individual']</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Individual Editing Form</td> <td>Individual Editing Form</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>_delete</td> <td>_delete</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertConfirmation</td> <td>assertConfirmation</td>
<td>Are you SURE you want to delete this entity? If in doubt, CANCEL.</td> <td>Are you SURE you want to delete this entity? If in doubt, CANCEL.</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>waitForPageToLoad</td> <td>waitForPageToLoad</td>
<td>5000</td> <td>5000</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>VIVO Site Administration</td> <td>VIVO Site Administration</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>comment</td> <td>comment</td>
<td class="comment">Verify that Jane Faculty is indeed gone</td> <td class="comment">Verify that Jane Faculty is indeed gone</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=Index</td> <td>link=Index</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Index to VIVO Contents</td> <td>Index to VIVO Contents</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<<<<<<< .mine <td>refreshAndWait</td>
<td>refreshAndWait</td> <td>10000</td>
<td>10000</td> <td></td>
<td></td> </tr>
</tr> <tr>
<tr> <td>verifyTextNotPresent</td>
<td>verifyTextNotPresent</td> <td>Faculty Member</td>
<td>Faculty Member</td> <td></td>
<td></td> </tr>
</tr> <tr>
<tr> <td>comment</td>
======= <td class="comment">Logout</td>
>>>>>>> .r513 <td></td>
<td>comment</td> </tr>
<td class="comment">Logout</td> <tr>
<td></td> <td>clickAndWait</td>
</tr> <td>link=Log out</td>
<tr> <td></td>
<td>clickAndWait</td> </tr>
<td>link=Log out</td> <tr>
<td></td> <td>assertTitle</td>
</tr> <td>VIVO</td>
<tr> <td></td>
<td>assertTitle</td> </tr>
<td>VIVO</td>
<td></td> </tbody></table>
</tr> </body>
</html>
</tbody></table>
</body>
</html>