Merge branch 'master' of github.com:diaspora/diaspora_rails

1557e35a · danielvincent · 27818946 · 04396db4 · 1557e35a · 1557e35a
--- a/public/images/user/hamiltom.jpg
+++ b/public/images/user/hamiltom.jpg
--- a/test/selenium/diaspora_selenium
+++ b/test/selenium/diaspora_selenium
@@ -8,7 +8,7 @@
 <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="../../../Diaspora_selenium">Diaspora_selenium</a></td></tr>
+<tr><td><a href="post_and_delete_status_message_not_testing_websocket">post_and_delete_status_message_not_testing_websocket</a></td></tr>
 </tbody></table>
 </body>
 </html>
--- a/test/selenium/post_and_delete_status_message
+++ b/test/selenium/post_and_delete_status_message
@@ -4,12 +4,12 @@
 <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="http://tom.joindiaspora.com/" />
-<title>post_and_delete_status_message</title>
+<title>post_and_delete_status_message_not_testing_websocket</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">post_and_delete_status_message</td></tr>
+<tr><td rowspan="1" colspan="3">post_and_delete_status_message_not_testing_websocket</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -36,6 +36,11 @@
 	<td>status_message_submit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td></td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>THIS IS A RUNNING SELENIUM TEST AAAAAAAAH</td>
@@ -51,6 +56,11 @@
 	<td>Are you sure?</td>
 	<td></td>
 </tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td></td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>THIS IS A RUNNING SELENIUM TEST AAAAAAAAH</td>