From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 17 Oct 2012 08:04:20 +0000 (+0300)
Subject: Properly wait for the new page to load
X-Git-Tag: 7.0.0.beta6~31^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F131%2F1;p=vaadin-framework.git

Properly wait for the new page to load

Change-Id: I46ccd08732a90f2f737daa8d0c4b4c4509ae8476
---

diff --git a/uitest/src/com/vaadin/tests/integration/ProxyTest.html b/uitest/src/com/vaadin/tests/integration/ProxyTest.html
index f52f35ed55..b4e11210fc 100644
--- a/uitest/src/com/vaadin/tests/integration/ProxyTest.html
+++ b/uitest/src/com/vaadin/tests/integration/ProxyTest.html
@@ -22,15 +22,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>vaadin=runcomvaadintestsintegrationProxyTest::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VLink[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
-<tr>
-	<td>pause</td>
-	<td></td>
-	<td>2000</td>
-</tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=embed1::/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VLabel[0]</td>
@@ -52,15 +47,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>vaadin=runcomvaadintestsintegrationProxyTest::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VLink[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
-<tr>
-	<td>pause</td>
-	<td></td>
-	<td>2000</td>
-</tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=embed1::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VCheckBox[0]/domChild[0]</td>
@@ -77,15 +67,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>vaadin=runcomvaadintestsintegrationProxyTest::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VLink[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
-<tr>
-	<td>pause</td>
-	<td></td>
-	<td>2000</td>
-</tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsbuttonButtons::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VHorizontalLayout[0]/VOrderedLayout$Slot[0]/VCheckBox[0]/domChild[0]</td>