diff options
Diffstat (limited to 'tests/integration-testscripts')
5 files changed, 29 insertions, 32 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/Liferay-5/integration-test-liferay-5.2.3-portlet2.html b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html index 3cb45d252a..55c9d18eb8 100644 --- a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html +++ b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html @@ -123,7 +123,7 @@ </tr> <tr> <td>mouseClickAndWait</td> - <td>vaadin=v-JSR286TestPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[6]/VLink[0]/domChild[0]/domChild[0]</td> + <td>vaadin=v-JSR286TestPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[7]/VLink[0]/domChild[0]/domChild[0]</td> <td>28,7</td> </tr> <tr> @@ -166,7 +166,6 @@ <td>Maximize</td> <td></td> </tr> - </tbody></table> </body> </html> diff --git a/tests/integration-testscripts/Liferay-6/Liferay6-theme.html b/tests/integration-testscripts/Liferay-6/Liferay6-theme.html index 34919fe543..c61adb0dd7 100644 --- a/tests/integration-testscripts/Liferay-6/Liferay6-theme.html +++ b/tests/integration-testscripts/Liferay-6/Liferay6-theme.html @@ -313,7 +313,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -323,12 +323,12 @@ </tr> <tr> <td>closeNotification</td> - <td>//body/div[2]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td> <td>0,0</td> </tr> <tr> <td>click</td> - <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[1]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -338,12 +338,12 @@ </tr> <tr> <td>closeNotification</td> - <td>//body/div[2]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td> <td>0,0</td> </tr> <tr> <td>click</td> - <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[2]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -353,7 +353,7 @@ </tr> <tr> <td>closeNotification</td> - <td>//body/div[2]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td> <td>0,0</td> </tr> <!-- @@ -365,7 +365,7 @@ --> <tr> <td>click</td> - <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[3]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -375,7 +375,7 @@ </tr> <tr> <td>closeNotification</td> - <td>//body/div[2]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td> <td>0,0</td> </tr> <tr> diff --git a/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html b/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html index ddd01d4e3f..f4772ef7ad 100644 --- a/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html +++ b/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html @@ -314,7 +314,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -324,12 +324,12 @@ </tr> <tr> <td>closeNotification</td> - <td>//body/div[2]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td> <td>0,0</td> </tr> <tr> <td>click</td> - <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[1]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -339,12 +339,12 @@ </tr> <tr> <td>closeNotification</td> - <td>//body/div[2]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td> <td>0,0</td> </tr> <tr> <td>click</td> - <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[2]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -354,7 +354,7 @@ </tr> <tr> <td>closeNotification</td> - <td>//body/div[2]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td> <td>0,0</td> </tr> <!-- @@ -366,7 +366,7 @@ --> <tr> <td>click</td> - <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[3]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -376,7 +376,7 @@ </tr> <tr> <td>closeNotification</td> - <td>//body/div[2]</td> + <td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td> <td>0,0</td> </tr> <tr> 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..af85dfd161 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> @@ -153,7 +153,7 @@ </tr> <tr> <td>mouseClickAndWait</td> - <td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div/div[5]/div/div/a</td> + <td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div[5]/div/a</td> <td>10,10</td> </tr> <tr> @@ -173,7 +173,7 @@ </tr> <tr> <td>mouseClickAndWait</td> - <td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div/div[5]/div/div/a</td> + <td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div[5]/div/a</td> <td>15,8</td> </tr> <tr> @@ -191,7 +191,6 @@ <td></td> <td>done</td> </tr> - </tbody></table> </body> </html> |