From 153ff7b1a0e0d7e9576693fa8d8cae029ddd91d0 Mon Sep 17 00:00:00 2001
From: Anthony Chu <anthony.chu@liferay.com>
Date: Wed, 11 Oct 2017 14:35:51 -0700
Subject: [PATCH] LRQA-35459 Refactor page teardown to use Product Menu

---
 .../com/liferay/portalweb/macros/Page.macro   | 22 ++++++++++++++-----
 .../paths/portlet/sitepages/SitePages.path    |  5 +++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/portal-web/test/functional/com/liferay/portalweb/macros/Page.macro b/portal-web/test/functional/com/liferay/portalweb/macros/Page.macro
index 7646cbd3d7740f..aa7f6cc5a91e44 100644
--- a/portal-web/test/functional/com/liferay/portalweb/macros/Page.macro
+++ b/portal-web/test/functional/com/liferay/portalweb/macros/Page.macro
@@ -771,19 +771,29 @@
 		</execute>
 
 		<while>
-			<condition function="IsElementPresent#isElementPresentClickNavigation" locator1="Home#PAGE_2" />
+			<condition function="IsElementPresent" locator1="SitePages#PAGE_ELLIPSIS_2" />
 			<then>
-				<execute function="MouseOver#mouseOverClickNavigation" locator1="Home#PAGE_2" />
+				<execute macro="ProductMenuHelper#expandPanel">
+					<var name="panel" value="Site Administration" />
+				</execute>
+
+				<execute macro="ProductMenuHelper#expandCategory">
+					<var name="category" value="Navigation" />
+				</execute>
 
-				<execute function="ClickNoError" locator1="Home#DELETE_PAGE_ICON" />
+				<execute function="MouseOver#mouseOverNotVisible" locator1="SitePages#PAGE_ELLIPSIS_2" />
 
-				<execute function="Confirm" value1="Are you sure you want to delete this page?" />
+				<execute function="Click" locator1="SitePages#PAGE_ELLIPSIS_2" />
+
+				<execute function="AssertClickNoError" locator1="MenuItem#ANY_MENU_ITEM" value1="Delete">
+					<var name="key_menuItem" value="Delete" />
+				</execute>
 
-				<execute function="Refresh" />
+				<execute function="Confirm" value1="Are you sure you want to delete the selected page?" />
 			</then>
 		</while>
 
-		<execute function="AssertElementNotPresent#assertElementNotPresentClickDockbar" locator1="Home#DELETE_PAGE_ICON" />
+		<execute function="AssertElementNotPresent" locator1="SitePages#PAGE_ELLIPSIS_2" />
 	</command>
 
 	<command name="togglePageTemplateInheritChanges">
diff --git a/portal-web/test/functional/com/liferay/portalweb/paths/portlet/sitepages/SitePages.path b/portal-web/test/functional/com/liferay/portalweb/paths/portlet/sitepages/SitePages.path
index 7af81ef58222ae..4899c22c18c6eb 100644
--- a/portal-web/test/functional/com/liferay/portalweb/paths/portlet/sitepages/SitePages.path
+++ b/portal-web/test/functional/com/liferay/portalweb/paths/portlet/sitepages/SitePages.path
@@ -450,6 +450,11 @@
 	<td>//div[contains(.,'${key_page}')]/*[@data-qa-id='pageOptions']</td>
 	<td></td>
 </tr>
+<tr>
+	<td>PAGE_ELLIPSIS_2</td>
+	<td>xpath=(//*[@data-qa-id='pageOptions'])[2]</td>
+	<td></td>
+</tr>
 </tbody>
 </table>
 </body>