Refactoring AdminUpdateCustomURLRewritesPermanentTest

magento · May 25, 2020 · 7bb812a · 7bb812a
1 parent 8d90d12
commit 7bb812a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/...ite/Test/Mftf/ActionGroup/AssertStorefrontUrlRewriteSuccessOutsideRedirectActionGroup.xml b/...ite/Test/Mftf/ActionGroup/AssertStorefrontUrlRewriteSuccessOutsideRedirectActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStorefrontUrlRewriteSuccessOutsideRedirectActionGroup">
+        <annotations>
+            <description>Assert redirect to proper URL on the Storefront.</description>
+        </annotations>
+        <arguments>
+            <argument name="target_path" type="string"/>
+        </arguments>
+
+        <seeInCurrentUrl url="{{target_path}}" stepKey="seePropertUrlRewrite"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesPermanentTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesPermanentTest.xml
@@ -51,8 +51,11 @@
         </actionGroup>
 
         <!--AssertUrlRewriteSuccessOutsideRedirect-->
-        <amOnPage url="{{StorefrontHomePage.url}}{{customPermanentUrlRewrite.request_path}}" stepKey="amOnStorefrontPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <seeInCurrentUrl url="{{customPermanentUrlRewrite.target_path}}" stepKey="seeAssertUrlRewrite"/>
+        <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToTheStoreFront">
+            <argument name="page" value="{{customPermanentUrlRewrite.request_path}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontUrlRewriteSuccessOutsideRedirectActionGroup" stepKey="seeAssertUrlRewrite">
+            <argument name="target_path" value="{{customPermanentUrlRewrite.target_path}}"/>
+        </actionGroup>
     </test>
 </tests>