From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 24 Jul 2012 13:36:58 +0000 (+0300)
Subject: Tweak test scripts to work better with chrome
X-Git-Tag: 7.0.0.beta1~236^2~35
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b580bd0cd9dc69f588881ce7735c8039b80c0bd9;p=vaadin-framework.git

Tweak test scripts to work better with chrome
---

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=&quot;javascript:ajaxGet('/portal/private/classic/home?portal:componentId=UIApplicationList&amp;portal:action=SelectCategory&amp;objectId=demo&amp;ajaxRequest=true')&quot;]</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,14 +13,9 @@
 </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>
@@ -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=&quot;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&amp;portal:type=action&amp;uicomponent=UIApplicationOrganizer&amp;op=ImportAllApplications&amp;ajaxRequest=true')&quot;]</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>