summaryrefslogtreecommitdiffstats
path: root/uitest/src/com
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-10-17 11:04:20 +0300
committerLeif Åstrand <leif@vaadin.com>2012-10-17 11:04:20 +0300
commit121c6138e81f7e46dcadf1acdbc42313296ffc85 (patch)
treeb2c212d354d8886e7bc3dafbfa3f9a3fb9a7b540 /uitest/src/com
parentebd86a653a5d646e7d41da4ac7a42a0add1e2fcb (diff)
downloadvaadin-framework-121c6138e81f7e46dcadf1acdbc42313296ffc85.tar.gz
vaadin-framework-121c6138e81f7e46dcadf1acdbc42313296ffc85.zip
Properly wait for the new page to load
Change-Id: I46ccd08732a90f2f737daa8d0c4b4c4509ae8476
Diffstat (limited to 'uitest/src/com')
-rw-r--r--uitest/src/com/vaadin/tests/integration/ProxyTest.html21
1 files changed, 3 insertions, 18 deletions
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,16 +22,11 @@
<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>
<td>A generic test for Buttons in different configurations</td>
@@ -52,16 +47,11 @@
<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>
<td>7,5</td>
@@ -77,16 +67,11 @@
<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>
<td>35,7</td>