LRQA-26854 Extract common assertion to sit above conditional

liferay · Aug 10, 2016 · 9e1a3c4 · 9e1a3c4
1 parent 77d8471
commit 9e1a3c4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/portal-web/test/functional/com/liferay/portalweb/macros/AssetPublisherPortlet.macro b/portal-web/test/functional/com/liferay/portalweb/macros/AssetPublisherPortlet.macro
@@ -748,14 +748,14 @@
 			<elseif>
 				<equals arg1="${contentSharingAcrossSitesEnabled}" arg2="false" />
 				<then>
+					<execute function="AssertTextEquals" locator1="MenuItem#GLOBAL" value1="Global" />
+
 					<if>
 						<equals arg1="${childSite}" arg2="true" />
 						<then>
-							<execute function="AssertTextEquals" locator1="MenuItem#GLOBAL" value1="Global" />
 							<execute function="AssertTextEquals" locator1="MenuItem#OTHER_SITE" value1="Other Site..." />
 						</then>
 						<else>
-							<execute function="AssertTextEquals" locator1="MenuItem#GLOBAL" value1="Global" />
 							<execute function="AssertElementNotPresent" locator1="MenuItem#OTHER_SITE" />
 						</else>
 					</if>