Fix race condition in selenium tests

sourcefabric · Nov 24, 2014 · 3d0d148 · 3d0d148
1 parent 1255011
commit 3d0d148
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/tests/selenium/Calendar Add Show Skeleton.html b/tests/selenium/Calendar Add Show Skeleton.html
@@ -21,6 +21,11 @@
 	<td>link=Calendar</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForTable</td>
+	<td>css=table.fc-header.0.0</td>
+	<td>todayShow</td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>link=Show</td>
@@ -136,7 +141,6 @@
 	<td>id=add_show_color</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/tests/selenium/Calendar Skeleton Present.html b/tests/selenium/Calendar Skeleton Present.html
@@ -16,16 +16,31 @@
 	<td>/Library</td>
 	<td></td>
 </tr>
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Calendar</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForTable</td>
+	<td>id=schedule_block_table.0.1</td>
+	<td>todayShowNovember 2014dayweekmonthSunMonTueWedThuFriSat26<br /> <br /><br /><br />27<br /> <br /><br /><br />28<br /> <br /><br /><br />29<br /> <br /><br /><br />30<br /> <br /><br /><br />31<br /> <br /><br /><br />1<br /> <br /><br /><br />2<br /> <br /><br /><br />3<br /> <br /><br /><br />4<br /> <br /><br /><br />5<br /> <br /><br /><br />6<br /> <br /><br /><br />7<br /> <br /><br /><br />8<br /> <br /><br /><br />9<br /> <br /><br /><br />10<br /> <br /><br /><br />11<br /> <br /><br /><br />12<br /> <br /><br /><br />13<br /> <br /><br /><br />14<br /> <br /><br /><br />15<br /> <br /><br /><br />16<br /> <br /><br /><br />17<br /> <br /><br /><br />18<br /> <br /><br /><br />19<br /> <br /><br /><br />20<br /> <br /><br /><br />21<br /> <br /><br /><br />22<br /> <br /><br /><br />23<br /> <br /><br /><br />24<br /> <br /><br /><br />25<br /> <br /><br /><br />26<br /> <br /><br /><br />27<br /> <br /><br /><br />28<br /> <br /><br /><br />29<br /> <br /><br /><br />30<br /> <br /><br /><br />1<br /> <br /><br /><br />2<br /> <br /><br /><br />3<br /> <br /><br /><br />4<br /> <br /><br /><br />5<br /> <br /><br /><br />6<br /> <br /><br /><br />11:00 - 15:00Weekend Morning Blues<br /><br />11:00 - 12:00naregggg<br /><br />11:00 - 18:00TestNareg<br /><br />11:00 - 18:00TestNareg<br /><br />11:50 - 12:55nareg51<br /><br />11:00 - 18:00TestNareg<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />13:45 - 16:55nareg55<br /><br />13:45 - 14:57nareg55<br /><br />15:00 - 15:07nareg88<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />12:10 - 14:30nareg4<br /><br />15:00 - 19:00nareg5<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />12:10 - 14:30nareg4<br /><br />15:00 - 19:00nareg5<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />12:10 - 14:30nareg4<br /><br />22:01 - 23:00Untitled Show<br /><br />23:00 - 0:00Untitled Show<br />&nbsp;&nbsp;&nbsp;<br /><br />15:00 - 19:00nareg5<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />12:10 - 14:30nareg4<br />&nbsp;&nbsp;&nbsp;<br /><br />15:00 - 19:00nareg5<br />&nbsp;&nbsp;&nbsp;<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />12:10 - 14:30nareg4<br />&nbsp;&nbsp;&nbsp;<br /><br />15:00 - 19:00nareg5</td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>id=schedule_calendar</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForTable</td>
+	<td>css=table.fc-header.0.2</td>
+	<td>dayweekmonth</td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>//div[@id='schedule_calendar']/table/tbody/tr/td[3]/span[3]/span/span</td>
@@ -46,7 +61,6 @@
 	<td>//div[@id='schedule_calendar']/table/tbody/tr/td[3]/span/span/span</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>