diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-10-17 10:34:48 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-17 10:34:48 +0000 |
| commit | 1f9d17b75429ec7bff5696c0127de98eb9d6fcac (patch) | |
| tree | 93d9a8fca945eb72a305f827fe3daa61c6e8f994 /uitest | |
| parent | 62047610993ce39b50a1e7579d70c27bc91ca91c (diff) | |
| parent | 121c6138e81f7e46dcadf1acdbc42313296ffc85 (diff) | |
| download | vaadin-framework-1f9d17b75429ec7bff5696c0127de98eb9d6fcac.tar.gz vaadin-framework-1f9d17b75429ec7bff5696c0127de98eb9d6fcac.zip | |
Merge "Properly wait for the new page to load"
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/integration/ProxyTest.html | 21 |
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> |