Author: hangnguyen Date: 2011-09-07 02:43:39 -0400 (Wed, 07 Sep 2011) New Revision: 7318 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html Log: TESTVN-4136 - Daily tests on Portal Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_01_SignInSignOut.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -73,7 +73,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -108,7 +108,7 @@ </tr> <tr> <td>click</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -163,7 +163,7 @@ </tr> <tr> <td>click</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -218,7 +218,7 @@ </tr> <tr> <td>click</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03_ChangeDisplayLanguageInPublicMode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04_RememberMyLogin.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -63,7 +63,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,7 +103,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -248,12 +248,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[contains(@onclick,'componentId=_')]</td> + <td>//div[contains(@onclick,'componentId=_')]//a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> + <td>//div[contains(@onclick,'componentId=_')]//a</td> <td></td> </tr> <tr> @@ -413,7 +413,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -438,7 +438,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_06_CreateNewAccount.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -173,7 +173,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -198,7 +198,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -218,7 +218,7 @@ </tr> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -243,7 +243,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -253,7 +253,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -303,7 +303,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete user Test_SNF_PRL_06?</td> + <td>Are you sure you want to delete Test_SNF_PRL_06 user?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07_UsersManagement.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -153,7 +153,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -328,7 +328,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete user Test_SNF_PRL_07?</td> + <td>Are you sure you want to delete Test_SNF_PRL_07 user?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08_SearchUser.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09_GroupManagement.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -188,7 +188,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this group?</td> + <td>Are you sure you want to delete this group?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -173,7 +173,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete user john from group customers?</td> + <td>Are you sure you want to delete user john from group customers?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_11_MembershipManagement.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -178,7 +178,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this membership?</td> + <td>Are you sure you want to delete this membership?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_ImportApplication.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -118,7 +118,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>This will automatically import all gadgets and portlets into new categories.</td> + <td>This action will automatically create categories and import all the gadgets and portlets on it.</td> <td></td> </tr> <tr> @@ -228,7 +228,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> @@ -253,7 +253,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> @@ -283,7 +283,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_ShowOrHideImportApplicationIcon.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14_ManageCategory.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,17 +48,17 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>echo</td> + <td>-- Go to Application Registry--</td> <td></td> </tr> <tr> - <td>echo</td> - <td>-- Go to Application Registry--</td> + <td>clickAndWait</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -233,7 +233,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15_AddApplicationIntoCategory.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -228,7 +228,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this category and all its applications?</td> + <td>Are you sure to delete this category and all applications on it?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16_ViewPortlets.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Portlets</td> + <td>link=Portlet</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Portlets</td> + <td>link=Portlet</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17_ManageRemoteGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> @@ -143,12 +143,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Click here to add this gadget to a category. </td> + <td>link=Click here to add into categories</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Click here to add this gadget to a category. </td> + <td>link=Click here to add into categories</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_ManageManualGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Click here to add this gadget to a category. </td> + <td>link=Click here to add into categories</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Click here to add this gadget to a category.</td> + <td>link=Click here to add into categories</td> <td></td> </tr> <tr> @@ -218,12 +218,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGadgetInfo']/div/div[3]</td> + <td>//div[@id='UIGadgetInfo']//div[@title='Refresh information']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGadgetInfo']/div/div[3]</td> + <td>//div[@id='UIGadgetInfo']//div[@title='Refresh information']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>echo</td> - <td>-- Click on link to move to another page--</td> + <td>-- Click on link to move to another page-- </td> <td></td> </tr> <tr> @@ -83,12 +83,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@href='/portal/private/classic/organization/management']</td> + <td>//div[@class='ClearFix']/a[text()='Users and groups management']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//a[@href='/portal/private/classic/organization/management']</td> + <td>//div[@class='ClearFix']/a[text()='Users and groups management']</td> <td></td> </tr> <tr> @@ -98,12 +98,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//li[4]/ul/li[2]/a</td> + <td>//div[4]/div/div[2]/div/div[2]/div/a</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//li[4]/ul/li[2]/a</td> + <td>//div[4]/div/div[2]/div/div[2]/div/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_ExpandAllCollapseAll.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -108,7 +108,7 @@ </tr> <tr> <td>verifyNotVisible</td> - <td>//div[@id='UISiteMap']//a[text()='Applications Manager']</td> + <td>//div[@id='UISiteMap']//a[text()='Application Registry']</td> <td></td> </tr> <tr> @@ -118,7 +118,7 @@ </tr> <tr> <td>verifyNotVisible</td> - <td>//div[@id='UISiteMap']//a[text()='Pages Manager']</td> + <td>//div[@id='UISiteMap']//a[text()='Page Management']</td> <td></td> </tr> <tr> @@ -147,7 +147,7 @@ <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> + <td>verifyNotVisible</td> <td>//div[@id='UISiteMap']//a[text()='Blog']</td> <td></td> </tr> @@ -157,8 +157,8 @@ <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>//div[@id='UISiteMap']//a[text()='Red Hat']</td> + <td>verifyNotVisible</td> + <td>//div[@id='UISiteMap']//a[text()='Google']</td> <td></td> </tr> <tr> @@ -167,7 +167,7 @@ <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> + <td>verifyNotVisible</td> <td>//div[@id='UISiteMap']//a[text()='Facebook']</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_CreateNewPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[text()='Permission Settings']</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[text()='Permission Settings']</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> @@ -163,12 +163,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> @@ -228,12 +228,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> @@ -263,7 +263,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this portal?</td> + <td>Are you sure you want to delete this portal?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -88,12 +88,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td> + <td>//div[text()='Portal Templates']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td> + <td>//div[text()='Portal Templates']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> @@ -168,42 +168,42 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='PermissionSelector']//a[@title=&quot;Organization&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='PermissionSelector']//a[@title=&quot;Organization&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td>//div[@id='PermissionSelector']//a[@title=&quot;manager&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td>//div[@id='PermissionSelector']//a[@title=&quot;manager&quot;]</td> <td></td> </tr> <tr> @@ -248,7 +248,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this portal?</td> + <td>Are you sure you want to delete this portal?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -83,37 +83,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td> + <td>//div[text()='Portal Templates']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td> + <td>//div[text()='Portal Templates']</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIPortalForm']/div[3]/div[1]/div[4]/div/div/div[1]/div[2]/div[2]/div/div/div</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//form[@id='UIPortalForm']/div[3]/div[1]/div[4]/div/div/div[1]/div[2]/div[2]/div/div/div</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>-- Choose Properties tab--</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> @@ -123,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> @@ -173,42 +163,42 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Permission Settings</td> + <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td> + <td>link=Select Permission</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='PermissionSelector']//a[@title=&quot;Organization&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='PermissionSelector']/div/div[2]/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='PermissionSelector']//a[@title=&quot;Organization&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td>//div[@id='PermissionSelector']//a[@title=&quot;manager&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='PermissionSelector']/div/div[3]/div/div[2]/div[2]/a</td> + <td>//div[@id='PermissionSelector']//a[@title=&quot;manager&quot;]</td> <td></td> </tr> <tr> @@ -243,7 +233,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/Test_SNF_PRL_23/</td> + <td>http://localhost:8080/portal/Test_SNF_PRL_23/</td> <td></td> </tr> <tr> @@ -253,12 +243,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/</td> + <td>http://localhost:8080/portal/classic/</td> <td></td> </tr> <tr> @@ -288,7 +278,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure to delete this portal?</td> + <td>Are you sure you want to delete this portal?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_ChangeSiteConfigOFPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -243,12 +243,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[1]</td> + <td>//a[contains(@href,'Test_SNF_PRL_24')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[1]</td> + <td>//a[contains(@href,'Test_SNF_PRL_24')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> @@ -423,17 +423,17 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/Test_SNF_PRL_24/</td> + <td>http://localhost:8080/portal/Test_SNF_PRL_24/</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/</td> + <td>http://localhost:8080/portal/classic/</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_ChangeContainerInPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -243,12 +243,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_25&quot;) and text()=&quot;Edit Layout&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_25')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_25&quot;) and text()=&quot;Edit Layout&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_25')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> @@ -418,8 +418,8 @@ </tr> <tr> <td>dragAndDropToObject</td> - <td>//div/div/div[2]/div/div[2]/div/div</td> - <td>//div[4]/div/div[2]/div/div[2]/div</td> + <td>//div[@title=&quot;Hold this area to drag this container&quot;]</td> + <td>//div[contains(text(),'Navigation Portlet')]</td> </tr> <tr> <td>echo</td> @@ -438,12 +438,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> @@ -493,12 +493,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> @@ -523,12 +523,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_25&quot;) and text()=&quot;Delete&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_25')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_25&quot;) and text()=&quot;Delete&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_25')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> @@ -561,21 +561,6 @@ <td>link=Sign out</td> <td></td> </tr> -<tr> - <td>verifyElementPresent</td> - <td>//div/div/div[2]/div/div[2]/div/div</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[4]/div/div[2]/div/div[2]/div/div</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[4]/div/div[2]/div/div[2]/div/div</td> - <td></td> -</tr> </tbody></table> </body> </html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -248,12 +248,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_26&quot;) and text()=&quot;Edit Layout&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_26')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_26&quot;) and text()=&quot;Edit Layout&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_26')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> @@ -298,6 +298,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td></td> </tr> @@ -378,12 +388,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -472,33 +482,33 @@ <td></td> </tr> <tr> - <td>echo</td> - <td>-- Delete application --</td> + <td>waitForElementPresent</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@class='PortletIcon AcrobatFile']</td> + <td>click</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> - <td>mouseOver</td> - <td>//div[@class='PortletIcon AcrobatFile']</td> + <td>echo</td> + <td>-- Delete application --</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[text()='Test_SNF_PRL_26']/ancestor::div/a[@title='Delete Portlet']</td> + <td>//div[@class='PortletIcon AcrobatFile']</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div[text()='Test_SNF_PRL_26']/ancestor::div/a[@title='Delete Portlet']</td> + <td>//div[@class='PortletIcon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[text()='Test_SNF_PRL_26']/ancestor::div/a[@title='Delete Portlet']</td> + <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> @@ -528,12 +538,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_26&quot;) and text()=&quot;Delete&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_26')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_26&quot;) and text()=&quot;Delete&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_26')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_AddApplicationIntoContainerInLayoutOfPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=classic&quot;) and text()=&quot;Edit Layout&quot;]</td> + <td>//a[contains(@href,'classic')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=classic&quot;) and text()=&quot;Edit Layout&quot;]</td> + <td>//a[contains(@href,'classic')]/preceding-sibling::a[text()='Edit Layout']</td> <td></td> </tr> <tr> @@ -153,6 +153,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_28_EditPortalConfig.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -273,12 +273,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;Test_SNF_PRL_28&quot;) and text()=&quot;Edit Portal's Config&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_28') and contains(text(),'Edit Portal')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;Test_SNF_PRL_28&quot;) and text()=&quot;Edit Portal's Config&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_28') and contains(text(),'Edit Portal')]</td> <td></td> </tr> <tr> @@ -398,7 +398,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/Test_SNF_PRL_28/</td> + <td>http://localhost:8080/portal/Test_SNF_PRL_28/</td> <td></td> </tr> <tr> @@ -408,7 +408,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=classic</td> + <td>link=Classic</td> <td></td> </tr> <tr> @@ -423,12 +423,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_28&quot;) and text()=&quot;Delete&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_28')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=Test_SNF_PRL_28&quot;) and text()=&quot;Delete&quot;]</td> + <td>//a[contains(@href,'Test_SNF_PRL_28')]/following-sibling::a[text()='Delete']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -98,12 +98,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -128,17 +128,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>open</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_29</td> + <td>http://localhost:8080/portal/classic/Test_SNF_PRL_29</td> <td></td> </tr> <tr> @@ -158,12 +158,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=classic&quot;) and text()=&quot;Edit Navigation&quot;]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;objectId=classic&quot;) and text()=&quot;Edit Navigation&quot;]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> @@ -248,12 +248,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -293,12 +293,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -98,12 +98,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -138,7 +138,7 @@ </tr> <tr> <td>open</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_30</td> + <td>http://localhost:8080/portal/classic/Test_SNF_PRL_30</td> <td></td> </tr> <tr> @@ -243,6 +243,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -328,12 +338,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -387,6 +397,11 @@ <td></td> </tr> <tr> + <td>mouseOver</td> + <td>//div[@title=&quot;Hold this area to drag this portlet&quot;]</td> + <td></td> +</tr> +<tr> <td>waitForTextPresent</td> <td>Test_SNF_PRL_30</td> <td></td> @@ -528,12 +543,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[8]/div/a</td> + <td>css=div.LastNode.Node &gt; div.NullItemIcon &gt; a.NodeIcon.DefaultPageIcon</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[8]/div/a</td> + <td>css=div.LastNode.Node &gt; div.NullItemIcon &gt; a.NodeIcon.DefaultPageIcon</td> <td></td> </tr> <tr> @@ -583,12 +598,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> @@ -648,12 +663,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;classic&quot;) and text()=&quot;Edit Navigation&quot;]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;classic&quot;) and text()=&quot;Edit Navigation&quot;]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> @@ -213,12 +213,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;classic&quot;) and text()=&quot;Edit Navigation&quot;]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;classic&quot;) and text()=&quot;Edit Navigation&quot;]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> @@ -288,8 +288,8 @@ </tr> <tr> <td>type</td> - <td>pageTitle</td> - <td>Page</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Group Navigation</td> </tr> <tr> <td>waitForElementPresent</td> @@ -368,12 +368,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;classic&quot;) and text()=&quot;Edit Navigation&quot;]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']//a[contains(@href,&quot;classic&quot;) and text()=&quot;Edit Navigation&quot;]</td> + <td>//a[contains(@href,'classic') and contains(text(),'Edit Navigation')]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/classic/</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -123,12 +123,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td> - <td></td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Group Navigation</td> </tr> <tr> <td>type</td> - <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> <td>Group Navigation</td> </tr> <tr> @@ -143,6 +143,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>//a[@title='Quick Search']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//a[@title='Quick Search']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//img[@title='Select Page']</td> <td></td> </tr> @@ -242,7 +252,7 @@ <td></td> </tr> <tr> - <td>mouseOver</td> + <td>click</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[8]/div/a</td> <td></td> </tr> @@ -253,12 +263,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/a</td> + <td>link=Cut Node</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/a</td> + <td>link=Cut Node</td> <td></td> </tr> <tr> @@ -313,12 +323,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[6]/a</td> + <td>link=Clone Node</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[6]/a</td> + <td>link=Clone Node</td> <td></td> </tr> <tr> @@ -447,13 +457,18 @@ <td></td> </tr> <tr> + <td>click</td> + <td>css=a.NodeIcon.DefaultPageIcon</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_32']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic</td> + <td>/portal/classic</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -123,16 +123,26 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>pageTitle</td> - <td></td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Community Management</td> </tr> <tr> <td>type</td> - <td>pageTitle</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> <td>Community Management</td> </tr> <tr> <td>waitForElementPresent</td> + <td>name=searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>name=searchOption</td> + <td>label=group</td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//a[@title='Quick Search']</td> <td></td> </tr> @@ -218,12 +228,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[8]/div/a</td> + <td>//a[@title='Test_SNF_PRL_33']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[8]/div/a</td> + <td>//a[@title='Test_SNF_PRL_33']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic</td> + <td>/portal/classic</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -122,19 +122,24 @@ <td></td> </tr> <tr> - <td>waitForText</td> - <td>link=Test_SNF_PRL_34</td> - <td>Test_SNF_PRL_34</td> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Community Management</td> </tr> <tr> + <td>type</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> + <td>Community Management</td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>pageTitle</td> + <td>name=searchOption</td> <td></td> </tr> <tr> - <td>type</td> - <td>pageTitle</td> - <td>Community Management</td> + <td>select</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> @@ -522,8 +527,8 @@ <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td> + <td>open</td> + <td>http://localhost:8080/portal/classic/Test_SNF_PRL_34</td> <td></td> </tr> <tr> @@ -557,11 +562,6 @@ <td></td> </tr> <tr> - <td>pause</td> - <td>10000</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>xpath=//a[@title='Test_SNF_PRL_34']</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic</td> + <td>/portal/classic</td> <td></td> </tr> <tr> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -313,6 +313,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td>UIPortalApplication</td> </tr> @@ -388,17 +398,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[@class=&quot;PortletIcon PortletIcon&quot;]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div[2]/div/a</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div[2]/div/a</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -568,17 +578,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> + <td>//div[text()='Test_SNF_PRL_35']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_35']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_35']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -588,7 +598,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this portlet?</td> + <td>Are you sure to delete this portlet?</td> <td></td> </tr> <tr> @@ -623,7 +633,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td> + <td>//div[3]/div/div/div/div/div/div/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -372,6 +372,11 @@ <td></td> </tr> <tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_37_ManageNavigationOfGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_38_EditPropertiesForGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -38,7 +38,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -88,7 +88,7 @@ </tr> <tr> <td>mouseOver</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Properties</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Properties']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Properties</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Properties']</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageNavigationForm']/div[2]/div/div/a</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageNavigationForm']/div[2]/div/div/a</td> + <td>link=Save</td> <td></td> </tr> <tr> @@ -138,12 +138,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//li[2]/ul/li/a</td> + <td>link=New Staff</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//li[2]/ul/li[2]/a</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -158,12 +158,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//table[2]/tbody/tr/td[3]/a[2]</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Properties']</td> <td></td> </tr> <tr> <td>click</td> - <td>//table[2]/tbody/tr/td[3]/a[2]</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Properties']</td> <td></td> </tr> <tr> @@ -173,12 +173,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageNavigationForm']/div[2]/div/div/a</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageNavigationForm']/div[2]/div/div/a</td> + <td>link=Save</td> <td></td> </tr> <tr> @@ -188,12 +188,12 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//li[4]/ul/li/a</td> + <td>link=New Staff</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//li[4]/ul/li[2]/a</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,12 +133,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]//a[@title='Finish']</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]//a[@title='Finish']</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -162,13 +162,18 @@ <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>Administrators</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> <td></td> </tr> <tr> @@ -213,7 +218,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this node?</td> + <td>Are you sure to delete this node?</td> <td></td> </tr> <tr> @@ -258,12 +263,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -288,7 +293,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Do you want to delete this page?</td> + <td>Are you sure to delete this page?</td> <td></td> </tr> <tr> @@ -303,12 +308,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,12 +133,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -248,6 +248,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -483,7 +493,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this Container?</td> + <td>Are you sure to delete this Container?</td> <td></td> </tr> <tr> @@ -518,7 +528,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/organization/Test_SNF_PRL_40</td> + <td>http://localhost:8080/portal/groups/:organization:management:executive-board/organization/Test_SNF_PRL_40</td> <td></td> </tr> <tr> @@ -543,22 +553,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//table[2]/tbody/tr/td[3]/a</td> + <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_SNF_PRL_40']</td> <td></td> </tr> <tr> <td>click</td> - <td>//table[2]/tbody/tr/td[3]/a</td> + <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_SNF_PRL_40']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_SNF_PRL_40']</td> + <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_40']</td> <td></td> </tr> <tr> <td>mouseDownRight</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_SNF_PRL_40']</td> + <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_40']</td> <td></td> </tr> <tr> @@ -578,7 +588,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this node?</td> + <td>Are you sure to delete this node?</td> <td></td> </tr> <tr> @@ -598,7 +608,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> @@ -618,12 +628,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -663,12 +673,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,12 +48,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,17 +133,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>open</td> - <td>http://localhost:8080/portal/private/classic/administration/Test_SNF_PRL_41</td> + <td>http://localhost:8080/portal/classic/Test_SNF_PRL_41</td> <td></td> </tr> <tr> @@ -308,13 +308,13 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> - <td></td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> + <td><br /></td> </tr> <tr> <td>waitForElementPresent</td> @@ -338,13 +338,13 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> - <td>Edit Navigation</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> + <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> - <td>Edit Navigation</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> + <td></td> </tr> <tr> <td>echo</td> @@ -398,13 +398,13 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> <td>pageTitle</td> - <td>Test_SNF_PRL_41</td> + <td></td> </tr> <tr> <td>type</td> @@ -412,13 +412,18 @@ <td>Test_SNF_PRL_41</td> </tr> <tr> + <td>select</td> + <td>name=searchOption</td> + <td>label=group</td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -458,16 +463,91 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> + <td>echo</td> + <td>- Return to default skin -</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Edit layout --</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Site's config from edit inline composer--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site's Config</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Site's Config</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Make change something --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>skin</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>skin</td> + <td>label=Default</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Finish change in Site config's portal --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,17 +133,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/administration/Test_SNF_PRL_42</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/administration/Test_SNF_PRL_42</td> <td></td> </tr> <tr> @@ -168,12 +168,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td> + <td>link=Switch View Mode</td> <td></td> </tr> <tr> @@ -203,12 +203,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIPortalComposerTab']//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIPortalComposerTab']//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> @@ -258,12 +258,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> @@ -289,7 +294,7 @@ <tr> <td>waitForElementPresent</td> <td>height</td> - <td>100px</td> + <td></td> </tr> <tr> <td>type</td> @@ -313,12 +318,12 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_42</td> + <td>css=div.DragControlArea</td> + <td></td> </tr> <tr> <td>dragAndDropToObject</td> - <td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td> + <td>css=div.DragControlArea</td> <td>//div[@class='LAYOUT-PORTAL LAYOUT-BLOCK']</td> </tr> <tr> @@ -353,17 +358,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_42</td> + <td>//div[text()='Test_SNF_PRL_42']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_42']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_42']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -378,12 +383,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -403,12 +408,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> + <td>link=Edit Navigation</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> + <td>link=Edit Navigation</td> <td></td> </tr> <tr> @@ -468,32 +473,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>searchTerm</td> + <td>pageTitle</td> <td></td> </tr> <tr> <td>type</td> - <td>searchTerm</td> + <td>pageTitle</td> <td>Test_SNF_PRL_42</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -533,12 +533,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,12 +48,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,17 +133,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/administration/Test_SNF_PRL_43</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/administration/Test_SNF_PRL_43</td> <td></td> </tr> <tr> @@ -203,6 +203,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td>UIPortalApplication</td> </tr> @@ -258,17 +268,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -288,22 +298,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Select Icon&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Select Icon&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -313,22 +323,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Decoration Themes&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Decoration Themes&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()=&quot;Pink Simple&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()=&quot;Pink Simple&quot;]</td> <td></td> </tr> <tr> @@ -388,17 +398,12 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_43</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> + <td>//div[text()='Test_SNF_PRL_43']/preceding-sibling::div[@class='DragControlArea']</td> <td></td> </tr> <tr> <td>dragAndDropToObject</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> + <td>//div[text()='Test_SNF_PRL_43']/preceding-sibling::div[@class='DragControlArea']</td> <td>css=div[class='LAYOUT-BLOCK LAYOUT-PORTLET']</td> </tr> <tr> @@ -443,17 +448,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_43</td> + <td>//div[text()='Test_SNF_PRL_43']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_43']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_43']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -468,12 +473,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -493,13 +498,13 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> - <td>Edit Navigation</td> + <td>link=Edit Navigation</td> + <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> - <td>Edit Navigation</td> + <td>link=Edit Navigation</td> + <td></td> </tr> <tr> <td>echo</td> @@ -558,32 +563,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>searchTerm</td> + <td>pageTitle</td> <td></td> </tr> <tr> <td>type</td> - <td>searchTerm</td> + <td>pageTitle</td> <td>Test_SNF_PRL_43</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -623,12 +623,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,12 +48,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> @@ -73,12 +73,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageNodeSelector']/div/div/div[2]/div/div/div/div[1]/a</td> + <td>//div[@id='UIPageNodeSelector']//a[@title='Up Level']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -133,17 +133,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/administration/Test_SNF_PRL_44</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/administration/Test_SNF_PRL_44</td> <td></td> </tr> <tr> @@ -203,12 +203,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> @@ -233,12 +233,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Applications&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Applications&quot;)]</td> <td></td> </tr> <tr> @@ -247,6 +247,11 @@ <td></td> </tr> <tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> @@ -293,22 +298,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div[2]</td> - <td>Calculator</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -328,27 +328,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Container</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -368,12 +368,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalApplication']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalApplication']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> @@ -393,13 +393,13 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> - <td>Edit Navigation</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> + <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td> - <td>Edit Navigation</td> + <td>//td/div[text()='Administrators']/ancestor::tr/td/a[text()='Edit Navigation']</td> + <td></td> </tr> <tr> <td>echo</td> @@ -453,7 +453,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Pages Manager</td> + <td>link=Page Management</td> <td></td> </tr> <tr> @@ -478,12 +478,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -518,12 +518,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]//div[text()=&quot;Page Selector&quot;]</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]//div[text()=&quot;Page Selector&quot;]</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> @@ -137,33 +137,23 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/input</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>//form[@id='UIPageSearchForm']/div[2]/input</td> - <td>New Account</td> + <td>//input[@id='pageTitle' and @value='Register']</td> + <td>Register</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>name=searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> <td>name=searchOption</td> - <td>label=group</td> + <td>label=portal</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -288,17 +278,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]//div[text()=&quot;Page Selector&quot;]</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]//div[text()=&quot;Page Selector&quot;]</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>echo</td> - <td>-- Choose new page for this node--</td> + <td>-- Select a page for ndoe--</td> <td></td> </tr> <tr> @@ -313,12 +303,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIRepeater']/table/tbody/tr[4]/td[5]/div/img</td> + <td>//tr[5]/td[5]/div/img</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIRepeater']/table/tbody/tr[4]/td[5]/div/img</td> + <td>//tr[5]/td[5]/div/img</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_46_MoreActionOnNodeInEditNavigationOfGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Edit Navigation</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Navigation']</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Edit Navigation</td> + <td>//td/div[text()='Executive Board']/ancestor::tr/td/a[text()='Edit Navigation']</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> @@ -153,22 +153,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//img[@title='Select Page']</td> + <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> <tr> <td>click</td> - <td>//img[@title='Select Page']</td> + <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -223,12 +223,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Organization']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Organization']</td> <td></td> </tr> <tr> @@ -242,13 +242,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='NavigationNodePopupMenu']/div/div[2]/div/div/div[7]/a</td> - <td></td> -</tr> -<tr> <td>click</td> - <td>//div[@id='NavigationNodePopupMenu']/div/div[2]/div/div/div[7]/a</td> + <td>//div[@id='NavigationNodePopupMenu']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> @@ -258,17 +253,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[2]/div/div/div[3]/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[2]/div/div/div[3]/div/a</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Test_SNF_PRL_46']</td> <td></td> </tr> <tr> @@ -278,12 +273,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/a</td> + <td>link=Cut Node</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/a</td> + <td>link=Cut Node</td> <td></td> </tr> <tr> @@ -293,12 +288,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Organization']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@title='Organization']</td> <td></td> </tr> <tr> @@ -313,12 +308,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div[7]/a</td> + <td>//div[@id='NavigationNodePopupMenu']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div[7]/a</td> + <td>//div[@id='NavigationNodePopupMenu']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> @@ -358,16 +353,26 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@class='LevelUpArrowIcon']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]/a</td> + <td>//div[@id='UINavigationNodeSelector']//a[@class='LevelUpArrowIcon']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//div[@id='UINavigationNodeSelector']//a[@class='LevelUpArrowIcon']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UINavigationNodeSelector']//a[@class='LevelUpArrowIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@class='HomeNode']</td> <td></td> </tr> @@ -378,12 +383,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Paste Node</td> + <td>//div[@id='NavigationNodePopupMenu']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Paste Node</td> + <td>//div[@id='UINavigationManagement']//a[contains(text(),'Paste Node')]</td> <td></td> </tr> <tr> @@ -392,13 +397,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> - <td></td> -</tr> -<tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>link=Test_SNF_PRL_46</td> <td></td> </tr> <tr> @@ -493,6 +493,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>css=a.NodeIcon.DefaultPageIcon</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>css=a.NodeIcon.DefaultPageIcon</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//a[@title='New Staff']</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_47_EditNodePagePropertiesForGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,15 +103,20 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> + <td>echo</td> + <td>-- Select a page for ndoe--</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Search and Select Page</td> <td></td> @@ -122,17 +127,37 @@ <td></td> </tr> <tr> + <td>type</td> + <td>//input[@id='pageTitle' and @value='Register']</td> + <td>Register</td> +</tr> +<tr> + <td>select</td> + <td>name=searchOption</td> + <td>label=portal</td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> @@ -163,12 +188,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_47</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_47</td> <td></td> </tr> <tr> @@ -208,12 +233,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_47']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_47']</td> <td></td> </tr> <tr> @@ -313,7 +338,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_47</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/Test_SNF_PRL_47</td> <td></td> </tr> <tr> @@ -338,12 +363,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_47']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_47']</td> <td></td> </tr> <tr> @@ -438,7 +463,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_47</td> + <td>http://localhost:8080/portal/groups/:platform:administrators/Test_SNF_PRL_47</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,15 +103,20 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> + <td>echo</td> + <td>-- Select a page for ndoe--</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Search and Select Page</td> <td></td> @@ -122,43 +127,33 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>searchTerm</td> - <td>New Account</td> + <td>//input[@id='pageTitle' and @value='Register']</td> + <td>Register</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=portal</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> <td>click</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -193,12 +188,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_48</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_48</td> <td></td> </tr> <tr> @@ -238,12 +233,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_48']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_48']</td> <td></td> </tr> <tr> @@ -313,12 +308,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> @@ -368,17 +363,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> @@ -428,12 +428,12 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>css=div.DragControlArea</td> <td>Test_SNF_PRL_48</td> </tr> <tr> <td>dragAndDropToObject</td> - <td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td> + <td>css=div.DragControlArea</td> <td>//a[@title='mix']</td> </tr> <tr> @@ -478,17 +478,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[@class=&quot;ContainerIcon&quot;]</td> - <td>Test_SNF_PRL_48</td> + <td>//div[text()='Test_SNF_PRL_48']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_48']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_48']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -503,12 +503,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> @@ -518,12 +518,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[2]/div/div/div/div</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationManagement']/div[3]/table/tbody/tr/td[2]/div/div/div/div</td> + <td>link=Save</td> <td></td> </tr> <tr> @@ -563,12 +563,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_48']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_48']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> @@ -127,43 +127,33 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>searchTerm</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> <td>Community Management</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> <td>click</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -197,13 +187,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[4]/div[2]/div/a</td> - <td></td> -</tr> -<tr> <td>clickAndWait</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_49</td> <td></td> </tr> <tr> @@ -243,12 +228,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_49']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_49']</td> <td></td> </tr> <tr> @@ -337,6 +322,11 @@ <td></td> </tr> <tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td>UIPortalApplication</td> @@ -393,17 +383,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td>Calculator</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -423,22 +413,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Select Icon&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Select Icon&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -448,22 +438,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Decoration Themes&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Decoration Themes&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()=&quot;Pink Simple&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()=&quot;Pink Simple&quot;]</td> <td></td> </tr> <tr> @@ -523,8 +513,8 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_49</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForTextPresent</td> @@ -558,8 +548,8 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_49</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> @@ -578,12 +568,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//td/div[2]/div/div/div/div</td> + <td>link=Switch View mode</td> <td></td> </tr> <tr> <td>click</td> - <td>//td/div[2]/div/div/div/div</td> + <td>link=Switch View mode</td> <td></td> </tr> <tr> @@ -653,17 +643,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_49</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_49']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -678,12 +668,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> @@ -743,12 +733,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_49']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_49']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Page Selector']</td> <td></td> </tr> <tr> @@ -122,43 +122,33 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>searchTerm</td> + <td>//form[@id='UIPageSearchForm']/div[2]/input</td> <td>Community Management</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Title</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> <td>click</td> - <td>xpath=//img[@title='Select Page']</td> + <td>//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -192,13 +182,8 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[4]/div[2]/div/a</td> - <td></td> -</tr> -<tr> <td>clickAndWait</td> - <td>//div[4]/div[2]/div/a</td> + <td>link=Test_SNF_PRL_50</td> <td></td> </tr> <tr> @@ -238,12 +223,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_50']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_50']</td> <td></td> </tr> <tr> @@ -287,16 +272,6 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/div[2]/div/div/div[1]</td> - <td></td> -</tr> -<tr> - <td>verifyElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div/div/div[2]/div/div/div[1]</td> - <td></td> -</tr> -<tr> <td>waitForTextPresent</td> <td>User Management</td> <td></td> @@ -343,12 +318,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> @@ -373,12 +348,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Applications&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Applications&quot;)]</td> <td></td> </tr> <tr> @@ -388,6 +363,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -433,17 +418,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -463,27 +448,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Container</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -503,12 +488,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> @@ -553,12 +538,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_50']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>xpath=//a[@title='Test_SNF_PRL_50']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_51_ManageGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -158,17 +158,17 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=Applications Manager</td> + <td>link=Application Registry</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> <td>click</td> - <td>link=Gadgets</td> + <td>link=Gadget</td> <td></td> </tr> <tr> @@ -183,7 +183,7 @@ </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to delete this gadget?</td> + <td>Are you sure to delete this gadget?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_52_ManageTab.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -68,27 +68,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/a</td> + <td>css=div.AddDashboard</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UITabPaneDashboard']/a</td> + <td>css=div.AddDashboard</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> - <td></td> -</tr> -<tr> <td>type</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td>Test_SNF_PRL_52</td> </tr> <tr> <td>keyPress</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td>\13</td> </tr> <tr> @@ -107,28 +102,23 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/span</td> - <td></td> -</tr> -<tr> <td>doubleClick</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/span</td> + <td>css=div.MiddleTab &gt; span</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td></td> </tr> <tr> <td>type</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td>Test_SNF_PRL_52_edit</td> </tr> <tr> <td>keyPress</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/input</td> + <td>//input</td> <td>\13</td> </tr> <tr> @@ -142,33 +132,23 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/a</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>-- Delete tab--</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/a</td> + <td>clickAndWait</td> + <td>//div[2]/div/div/div/div/a/img</td> <td></td> </tr> <tr> - <td>click</td> - <td>//div[@id='UITabPaneDashboard']/div[2]/a</td> - <td></td> -</tr> -<tr> <td>waitForConfirmationPresent</td> <td></td> <td></td> </tr> <tr> <td>assertConfirmation</td> - <td>Are you sure you want to remove this dashboard?</td> + <td>Really want to remove this dashboard?</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_53_DragAndDropGadget.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_54_AddNewpageForUser.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>type</td> - <td>pageDisplayName</td> + <td>i18nizedLabel</td> <td>Test_SNF_PRL_54</td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,116 +123,41 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_54</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_54</td> <td></td> </tr> <tr> - <td>echo</td> - <td>-- Go to Page Management --</td> + <td>clickAndWait</td> + <td>link=Dashboard</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Page Management</td> + <td>//div[2]/div/div/div/div/a/img</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td>Test_SNF_PRL_54</td> -</tr> -<tr> - <td>type</td> - <td>searchTerm</td> - <td>Test_SNF_PRL_54</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> - <td>select</td> - <td>searchOption</td> - <td>label=Title</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> - <td></td> -</tr> -<tr> - <td>echo</td> - <td>-- Delete page --</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//img[@title='Delete Page']</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//img[@title='Delete Page']</td> - <td></td> -</tr> -<tr> <td>waitForConfirmationPresent</td> <td></td> <td></td> </tr> <tr> <td>assertConfirmation</td> - <td>Do you want to delete this page?</td> + <td>Really want to remove this dashboard?</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> - <td></td> -</tr> -<tr> - <td>waitForTextNotPresent</td> - <td>Test_SNF_PRL_54</td> - <td></td> -</tr> -<tr> - <td>verifyTextNotPresent</td> - <td>Test_SNF_PRL_54</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_55_EditPageForUser.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>type</td> - <td>pageDisplayName</td> + <td>i18nizedLabel</td> <td>Test_SNF_PRL_55</td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,17 +123,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_55</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_55</td> <td></td> </tr> <tr> @@ -193,12 +193,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> @@ -223,12 +223,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Applications&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Applications&quot;)]</td> <td></td> </tr> <tr> @@ -238,6 +238,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -283,17 +293,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -313,22 +323,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Select Icon&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Select Icon&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -338,22 +348,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Decoration Themes&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Decoration Themes&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()=&quot;Pink Simple&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()=&quot;Pink Simple&quot;]</td> <td></td> </tr> <tr> @@ -413,17 +423,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Test_SNF_PRL_55']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_55']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_55']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -443,27 +453,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Container</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -483,12 +493,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -498,7 +508,7 @@ </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_55</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_55</td> <td></td> </tr> <tr> @@ -527,72 +537,7 @@ <td></td> </tr> <tr> - <td>echo</td> - <td>-- Go to Page Management --</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> - <td>link=Page Management</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Page Management</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>searchTerm</td> - <td>Test_SNF_PRL_55</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> - <td>select</td> - <td>searchOption</td> - <td>label=Title</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>No result found.</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_56_ChangeSiteConfigWhenEditLayoutForUserPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -62,12 +62,12 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> + <td>click</td> <td>link=Add New Page</td> <td></td> </tr> <tr> - <td>click</td> + <td>waitForElementPresent</td> <td>link=Add New Page</td> <td></td> </tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>type</td> - <td>pageDisplayName</td> + <td>i18nizedLabel</td> <td>Test_SNF_PRL_56</td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,17 +123,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_56</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_56</td> <td></td> </tr> <tr> @@ -197,8 +197,13 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[text()='Properties']</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[text()='Properties']</td> <td></td> </tr> <tr> @@ -218,20 +223,30 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title=&quot;Finish&quot;]</td> <td></td> </tr> <tr> <td>echo</td> + <td>- https://issues.jboss.org/browse/GTNPORTAL-2070 -</td> + <td></td> +</tr> +<tr> + <td>echo</td> <td>-- Delete new tab</td> <td></td> </tr> <tr> + <td>clickAndWait</td> + <td>link=Dashboard</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[2]/div/div/div/div/a/img</td> <td></td> @@ -252,7 +267,102 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- Edit Layout --</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Edit Layout</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Click Site's config from edit inline composer--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site's Config</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Site's Config</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Make change something --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>locale</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>locale</td> + <td>label=English</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>skin</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>skin</td> + <td>label=Default</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Properties--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[text()='Properties']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[text()='Properties']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Finish change in Site config's portal --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalComposer']//a[@title=&quot;Finish&quot;]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='UIPortalComposer']//a[@title=&quot;Finish&quot;]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>type</td> - <td>pageDisplayName</td> + <td>i18nizedLabel</td> <td>Test_SNF_PRL_57</td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,12 +123,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -198,12 +198,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> @@ -253,12 +253,12 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Edit Container']</td> <td></td> </tr> <tr> @@ -308,8 +308,8 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_57</td> + <td>//div[text()='Test_SNF_PRL_57']/following-sibling::a[@title='Edit Container']</td> + <td></td> </tr> <tr> <td>dragAndDropToObject</td> @@ -348,17 +348,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_57</td> + <td>//div[text()='Test_SNF_PRL_57']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_57']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_57']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -373,12 +373,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,17 +123,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>open</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_58</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_58</td> <td></td> </tr> <tr> @@ -193,6 +193,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/div[1]/div[1]</td> <td>UIPortalApplication</td> </tr> @@ -258,17 +268,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Edit Portlet']</td> <td></td> </tr> <tr> @@ -288,22 +298,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Select Icon&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Select Icon&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPortletForm']/div[3]/div/div/div[2]/div[2]/div/a[1]/div</td> + <td>//div[@class='Icon AcrobatFile']</td> <td></td> </tr> <tr> @@ -313,22 +323,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Decoration Themes&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']//div[text()=&quot;Decoration Themes&quot;]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()=&quot;Pink Simple&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div/div</td> + <td>//div[@id='UIItemThemeSelector']//div[text()=&quot;Pink Simple&quot;]</td> <td></td> </tr> <tr> @@ -388,13 +398,13 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Test_SNF_PRL_58</td> + <td>//div[text()='Test_SNF_PRL_58']/preceding-sibling::div[@class='DragControlArea']</td> + <td></td> </tr> <tr> <td>dragAndDropToObject</td> - <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> - <td>//div[@class='LPortletLayoutDecorator']</td> + <td>//div[text()='Test_SNF_PRL_58']/preceding-sibling::div[@class='DragControlArea']</td> + <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td> </tr> <tr> <td>echo</td> @@ -438,17 +448,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>//div[text()='Test_SNF_PRL_58']/following-sibling::a[@title='Delete Portlet']</td> <td>Test_SNF_PRL_58</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_58']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[text()='Test_SNF_PRL_58']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -463,12 +473,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -93,12 +93,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td> + <td>//div[contains(text(),'Next')]</td> <td></td> </tr> <tr> @@ -123,17 +123,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//a[@title='Finish']</td> <td></td> </tr> <tr> <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_59</td> + <td>http://localhost:8080/portal/users/root/Test_SNF_PRL_59</td> <td></td> </tr> <tr> @@ -193,12 +193,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> @@ -223,12 +223,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Applications&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[1]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Applications&quot;)]</td> <td></td> </tr> <tr> @@ -238,6 +238,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Gadgets</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Gadgets/Calculator']/div/div/img</td> <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div</td> </tr> @@ -283,17 +293,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Calculator</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Calculator']/following-sibling::a[@title='Delete Portlet']</td> <td></td> </tr> <tr> @@ -313,27 +323,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td> + <td>//div[contains(text(),&quot;Containers&quot;)]</td> <td></td> </tr> <tr> <td>mouseOver</td> - <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td>Container</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/a[2]</td> + <td>//div[text()='Container']/following-sibling::a[@title='Delete Container']</td> <td></td> </tr> <tr> @@ -353,12 +363,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPortalComposer']//a[@title='Finish']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -78,12 +78,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -113,47 +113,32 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>echo</td> - <td>-- Search by Owner typr</td> + <td>-- Search by Owner type is portal-</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>searchTerm</td> - <td>portal</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Owner type</td> + <td>name=searchOption</td> + <td>label=portal</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -163,92 +148,62 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>searchTerm</td> + <td>pageTitle</td> <td></td> </tr> <tr> <td>type</td> - <td>searchTerm</td> + <td>pageTitle</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>echo</td> - <td>-- Search by Owner id --</td> + <td>-- Search by Owner type is group --</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>searchTerm</td> - <td>classic</td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>searchOption</td> - <td></td> -</tr> -<tr> <td>select</td> - <td>searchOption</td> - <td>label=Owner id</td> + <td>name=searchOption</td> + <td>label=group</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>Home Page</td> - <td></td> -</tr> -<tr> - <td>verifyTextPresent</td> - <td>Home Page</td> - <td></td> -</tr> -<tr> <td>echo</td> - <td>-- Return to page list --</td> + <td>-- Return to Search by Owner type is portal-</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>searchTerm</td> - <td></td> + <td>select</td> + <td>name=searchOption</td> + <td>label=portal</td> </tr> <tr> - <td>type</td> - <td>searchTerm</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -208,12 +208,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -263,12 +263,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -317,13 +317,18 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- Close popup--</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -222,13 +222,18 @@ <td>Test_SNF_PRL_62</td> </tr> <tr> + <td>select</td> + <td>name=searchOption</td> + <td>label=group</td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -278,12 +283,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>//div[@id='UIPageEditor']//a[@title='Finish']</td> <td></td> </tr> <tr> @@ -308,12 +313,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> @@ -353,12 +358,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[contains(@onclick,&quot;action=Close&quot;)]</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_64_ChangeLanguageInPrivateMode.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_65_ChangeSkin.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> @@ -183,12 +183,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html 2011-09-07 02:33:38 UTC (rev 7317) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html 2011-09-07 06:43:39 UTC (rev 7318) @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -118,12 +118,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIAccountForm']/div[3]/div[2]/a[1]</td> + <td>link=Save</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIAccountForm']/div[3]/div[2]/a[1]</td> + <td>link=Save</td> <td></td> </tr> <tr> @@ -138,12 +138,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div/div[3]/div/div[2]/div/div/div/div/div/div[3]/div</td> + <td>//div[@id=&quot;UIAccountPortlet&quot;]//a[text()=&quot;OK&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div/div[3]/div/div[2]/div/div/div/div/div/div[3]/div</td> + <td>//div[@id=&quot;UIAccountPortlet&quot;]//a[text()=&quot;OK&quot;]</td> <td></td> </tr> <tr> @@ -183,7 +183,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -243,40 +243,35 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIAccountChangePass']/div[2]/div/div/a[1]</td> + <td>//div[@class='UIForm UIAccountChangePass']//a[text()=&quot;Save&quot;]</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIAccountChangePass']/div[2]/div/div/a[1]</td> + <td>//div[@class='UIForm UIAccountChangePass']//a[text()=&quot;Save&quot;]</td> <td></td> </tr> <tr> <td>waitForTextPresent</td> - <td>The password has been changed.</td> + <td>The password has been changed. </td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>The password has been changed.</td> + <td>The password has been changed. </td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td> + <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>link=Close</td> - <td></td> -</tr> -<tr> <td>click</td> <td>link=Close</td> <td></td> @@ -318,7 +313,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> @@ -368,12 +363,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>//a[@id='UIPortalLoginFormAction']</td> + <td>//div[@id='UIPortalLoginFormAction']</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=Users and Groups Manager</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> @@ -393,12 +388,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UISearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UISearchForm']/div[2]/a</td> + <td>//a[@title='Quick Search']</td> <td></td> </tr> <tr>