diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-07-24 16:36:58 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-07-24 16:54:05 +0300 |
| commit | b580bd0cd9dc69f588881ce7735c8039b80c0bd9 (patch) | |
| tree | f5691f4185756f1ee40e4a8e5f69af5238e76bc0 /tests/integration-testscripts | |
| parent | 906349642fb739f96244196f84e5587fc70c668c (diff) | |
| download | vaadin-framework-b580bd0cd9dc69f588881ce7735c8039b80c0bd9.tar.gz vaadin-framework-b580bd0cd9dc69f588881ce7735c8039b80c0bd9.zip | |
Tweak test scripts to work better with chrome
Diffstat (limited to 'tests/integration-testscripts')
| -rw-r--r-- | tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html | 3 | ||||
| -rw-r--r-- | tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html | 19 |
2 files changed, 10 insertions, 12 deletions
diff --git a/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html b/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html index 85258d7036..4bc3e6a2cf 100644 --- a/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html +++ b/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html @@ -93,7 +93,7 @@ </tr> <tr> <td>mouseClick</td> - <td>//div[3]/div</td> + <td>//div[@onclick="javascript:ajaxGet('/portal/private/classic/home?portal:componentId=UIApplicationList&portal:action=SelectCategory&objectId=demo&ajaxRequest=true')"]</td> <td>51,11</td> </tr> <tr> @@ -156,7 +156,6 @@ <td></td> <td>done</td> </tr> - </tbody></table> </body> </html> diff --git a/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html b/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html index 958c109e06..62561a66fe 100644 --- a/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html +++ b/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html @@ -13,15 +13,10 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/default/</td> + <td>/portal/public/intranet/</td> <td></td> </tr> <tr> - <td>mouseClick</td> - <td>link=Visit the Acme Social Intranet</td> - <td>121,7</td> -</tr> -<tr> <td>setTimeout</td> <td>60000</td> <td></td> @@ -47,13 +42,18 @@ <td></td> </tr> <tr> - <td>mouseClickAndWait</td> - <td>link=Applications Registry</td> + <td>open</td> + <td>/portal/private/intranet/administration/registry</td> <td>138,17</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIApplicationOrganizer']/div[1]/div[2]</td> + <td></td> +</tr> +<tr> <td>expectDialog</td> - <td>//div[@onclick="javascript:if(confirm('This action will automatically create categories and import all the gadgets and portlets on it.'))ajaxGet('/portal/private/intranet/administration/registry?portal:componentId=09e0ea8b-7d6e-410d-9ed0-871e3e7bc17f&portal:type=action&uicomponent=UIApplicationOrganizer&op=ImportAllApplications&ajaxRequest=true')"]</td> + <td>//div[@id='UIApplicationOrganizer']/div[1]/div[2]</td> <td>36,15</td> </tr> <tr> @@ -191,7 +191,6 @@ <td></td> <td>done</td> </tr> - </tbody></table> </body> </html> |