Commit db952335 authored by Richard Mansfield's avatar Richard Mansfield Committed by Gerrit Code Review
Browse files

Merge "selenium: Make selenium tests work"

parents 90b5aa73 d70040dd
......@@ -23,7 +23,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Profile Icons</td>
<td>link=Profile Pictures</td>
<td></td>
</tr>
<tr>
......
......@@ -57,13 +57,13 @@
<td></td>
</tr>
<tr>
<td>waitForTextPresent</td>
<td>Delete</td>
<td>pause</td>
<td>500</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>link=Delete</td>
<td>//img[@alt='[x]']</td>
<td></td>
</tr>
<tr>
......@@ -77,13 +77,13 @@
<td></td>
</tr>
<tr>
<td>waitForTextPresent</td>
<td>Delete</td>
<td>pause</td>
<td>500</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>link=Delete</td>
<td>//a[@title='Delete']</td>
<td></td>
</tr>
<tr>
......@@ -97,13 +97,13 @@
<td></td>
</tr>
<tr>
<td>waitForTextPresent</td>
<td>Delete</td>
<td>pause</td>
<td>500</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>link=Delete</td>
<td>//a[@title='Delete']</td>
<td></td>
</tr>
<tr>
......@@ -117,13 +117,13 @@
<td></td>
</tr>
<tr>
<td>waitForTextPresent</td>
<td>Delete</td>
<td>pause</td>
<td>500</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>link=Delete</td>
<td>//a[@title='Delete']</td>
<td></td>
</tr>
<tr>
......@@ -137,13 +137,13 @@
<td></td>
</tr>
<tr>
<td>waitForTextPresent</td>
<td>Delete</td>
<td>pause</td>
<td>500</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>link=Delete</td>
<td>//a[@title='Delete']</td>
<td></td>
</tr>
<tr>
......
......@@ -23,7 +23,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
<tr>
......@@ -68,7 +68,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
<tr>
......@@ -93,12 +93,12 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Files</td>
<td>link=Files</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Views</td>
<td>link=Pages</td>
<td></td>
</tr>
<tr>
......@@ -158,7 +158,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Institution Members</td>
<td>link=Members</td>
<td></td>
</tr>
<tr>
......@@ -173,7 +173,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Views</td>
<td>link=Pages</td>
<td></td>
</tr>
<tr>
......
......@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
<tr>
......
......@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
<tr>
......
......@@ -81,11 +81,22 @@
<td>institutionone_admin</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>edituser_site_passwordchange</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>edituser_site_submit</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Return to Site</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
......@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
<tr>
......
......@@ -33,7 +33,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
......
......@@ -81,11 +81,22 @@
<td>institutiontwo_admin</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>edituser_site_passwordchange</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>edituser_site_submit</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Return to Site</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
......@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
<tr>
......
......@@ -33,7 +33,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
......
......@@ -28,7 +28,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@name='i' and @value='institutionone']/parent::*/input[@name='delete']</td>
<td>//input[@name='delete' and @type='image']</td>
<td></td>
</tr>
<tr>
......@@ -51,6 +51,7 @@
<td>link=Return to Site</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
......@@ -28,7 +28,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@name='i' and @value='institutiontwo']/parent::*/input[@name='delete']</td>
<td>//input[@name='delete' and @type='image']</td>
<td></td>
</tr>
<tr>
......@@ -51,6 +51,7 @@
<td>link=Return to Site</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
......@@ -71,11 +71,22 @@
<td>New user account created successfully</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>edituser_site_passwordchange</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>edituser_site_submit</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Return to Site</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
......@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
<tr>
......
......@@ -33,7 +33,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
......
......@@ -71,11 +71,22 @@
<td>New user account created successfully</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>edituser_site_passwordchange</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>edituser_site_submit</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Return to Site</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
......@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
<tr>
......
......@@ -33,7 +33,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Home</td>
<td>link=Dashboard</td>
<td></td>
</tr>
......
......@@ -33,12 +33,12 @@
</tr>
<tr>
<td>assertText</td>
<td>//div[@id='sb-onlineusers']/h3</td>
<td>//div[@id='sb-onlineusers']/div/h3</td>
<td>Online users</td>
</tr>
<tr>
<td>assertText</td>
<td>//div[@id='sb-profile']/h3/a</td>
<td>//div[@id='sb-profile']/div/h3/a</td>
<td>Admin User</td>
</tr>
<tr>
......@@ -63,12 +63,12 @@
</tr>
<tr>
<td>assertText</td>
<td>//div[@id='sb-onlineusers']/h3</td>
<td>//div[@id='sb-onlineusers']/div/h3</td>
<td>Online users</td>
</tr>
<tr>
<td>assertText</td>
<td>//div[@id='sb-profile']/h3/a</td>
<td>//div[@id='sb-profile']/div/h3/a</td>
<td>Admin User</td>
</tr>
<tr>
......@@ -78,7 +78,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Profile Icons</td>
<td>link=Profile Pictures</td>
<td></td>
</tr>
<tr>
......@@ -98,7 +98,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Views</td>
<td>link=Pages</td>
<td></td>
</tr>
<tr>
......@@ -106,6 +106,11 @@
<td>//p[@id='quota_message']</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Content</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Files</td>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment