From b580bd0cd9dc69f588881ce7735c8039b80c0bd9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Tue, 24 Jul 2012 16:36:58 +0300 Subject: [PATCH] Tweak test scripts to work better with chrome --- ...ntegration-test-GateIn-3.1.0-portlet2.html | 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 @@ mouseClick - //div[3]/div + //div[@onclick="javascript:ajaxGet('/portal/private/classic/home?portal:componentId=UIApplicationList&portal:action=SelectCategory&objectId=demo&ajaxRequest=true')"] 51,11 @@ -156,7 +156,6 @@ done - 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 @@ open - /portal/public/default/ + /portal/public/intranet/ - - mouseClick - link=Visit the Acme Social Intranet - 121,7 - setTimeout 60000 @@ -47,13 +42,18 @@ - mouseClickAndWait - link=Applications Registry + open + /portal/private/intranet/administration/registry 138,17 + + waitForElementPresent + //div[@id='UIApplicationOrganizer']/div[1]/div[2] + + expectDialog - //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')"] + //div[@id='UIApplicationOrganizer']/div[1]/div[2] 36,15 @@ -191,7 +191,6 @@ done - -- 2.39.5