Skip to content

Commit 177254d

Browse files
sidolovsidolov
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #34165: Fix typo in README file (by @shochdoerfer) - #34157: Update devdocs ref. links (by @ravi-chandra3197) - #31894: [ReadMe] updated readMe file for MediaGallery-MediaStorage modules (by @vlmed) - #31100: MFTF: Admin Login As Customer - Change Account Information Test (by @DmitryTsymbal) - #32282: Replace repetitive actions with Action Groups in AdminSimpleProductTypeSwitchingToConfigurableProductTest and AdminConfigurableProductTypeSwitchingToVirtualProductTest (by @kate-kyzyma) - #31413: Fix problem actions dropdown positioned incorrect (by @mrtuvn) - #30803: [MFTF] Refactoring of CaptchaWithDisabledGuestCheckoutTest (by @AnnaAPak) - #30995: Update Api functional test install-config-mysql file template (by @dani97) - #30526: [MFTF] Add StorefrontSelectFirstShippingMethodActionGroup (by @Usik2203) - #30562: Replace repetitive actions with Action Groups in AdminUpdateTopCategoryUrlWithNoRedirectTest and AdminUpdateTopCategoryUrlWithRedirectTest (by @kate-kyzyma) - #31774: [ReadMe] updated readMe file for Customer-CustomerImportExport modules (by @vlmed) - #31785: [ReadMe] updated readMe file for Fedex-GoogleOptimizer modules (by @vlmed) - #34171: Update Checkout Module README Content (by @ravi-chandra3197) - #31877: [ReadMe] updated readMe file for LoginAsCustomer-Marketplace modules (by @vlmed) - #33128: Update zip_codes.xml patterns for Guernsey & Jersey (by @DrJohnM) - #33106: #32615: [GraphQL] Add assign customer to cart mutation (by @khrystynastolbova) - #33227: Move catalog search indexer outside stores loop (by @jasperzeinstra) - #30580: Fixing getUrl() function (by @amine-y) - #31654: Fix for adding more then one configurable product (by @nige-one) Fixed GitHub Issues: - #4451: Fix for admin shipment, creditmemo, invoice pdf emulation (reported by @ksz2013) has been fixed in #31894 by @vlmed in 2.4-develop branch Related commits: 1. a1f384c - #33788: [Issue] Replace repetitive actions with Action Groups in AdminSimpleProductTypeSwitchingToConfigurableProductTest and AdminConfigurableProductTypeSwitchingToVirtualProductTest (reported by @m2-assistant[bot]) has been fixed in #32282 by @kate-kyzyma in 2.4-develop branch Related commits: 1. fed6e3f 2. 8de44d2 3. 05854eb 4. f04234b 5. bbbfd33 6. d608d04 - #31379: Actions dropdown positioned against the last column, not against "Actions" colum (reported by @lbajsarowicz) has been fixed in #31413 by @mrtuvn in 2.4-develop branch Related commits: 1. 8428645 2. 354fb8e - #30828: [Issue] WIP: [MFTF] Refactoring of CaptchaWithDisabledGuestCheckoutTest (reported by @m2-assistant[bot]) has been fixed in #30803 by @AnnaAPak in 2.4-develop branch Related commits: 1. 702ef4a 2. 248994d 3. e523fd1 4. f6a5385 5. f7345f7 6. f25f653 7. b529667 8. cdfc5d5 9. 9bf0eac 10. 4277e9a 11. 5627666 12. 7d74fc5 - #31019: [Issue] Update Api functional test install-config-mysql file template (reported by @m2-assistant[bot]) has been fixed in #30995 by @dani97 in 2.4-develop branch Related commits: 1. 0b1b795 2. 876689b - #33773: [Issue] [MFTF] Add StorefrontSelectFirstShippingMethodActionGroup (reported by @m2-assistant[bot]) has been fixed in #30526 by @Usik2203 in 2.4-develop branch Related commits: 1. b466819 2. 7d3364b 3. 55e32b8 4. 97c1363 5. 4b1d3eb 6. 0de7b8e 7. 73c885d 8. c79967a 9. a636290 - #33774: [Issue] Replace repetitive actions with Action Groups in AdminUpdateTopCategoryUrlWithNoRedirectTest and AdminUpdateTopCategoryUrlWithRedirectTest (reported by @m2-assistant[bot]) has been fixed in #30562 by @kate-kyzyma in 2.4-develop branch Related commits: 1. 110be50 2. fa2f6e6 3. 9ce991c 4. 170f69a 5. 94c8892 6. a79847c 7. d9f6a8d 8. e33d9ac 9. 1a31738 10. d7da865 11. 4d72ced 12. 49aee80 - #4451: Fix for admin shipment, creditmemo, invoice pdf emulation (reported by @ksz2013) has been fixed in #31774 by @vlmed in 2.4-develop branch Related commits: 1. baa80af 2. 372b700 - #4451: Fix for admin shipment, creditmemo, invoice pdf emulation (reported by @ksz2013) has been fixed in #31785 by @vlmed in 2.4-develop branch Related commits: 1. 6ae6cc5 2. f51fd18 - #4451: Fix for admin shipment, creditmemo, invoice pdf emulation (reported by @ksz2013) has been fixed in #34171 by @ravi-chandra3197 in 2.4-develop branch Related commits: 1. 3805841 - #4451: Fix for admin shipment, creditmemo, invoice pdf emulation (reported by @ksz2013) has been fixed in #31877 by @vlmed in 2.4-develop branch Related commits: 1. 0ba4767 2. 4372776 3. bf63f1a - #33144: [Issue] Update zip_codes.xml patterns for Guernsey (reported by @m2-assistant[bot]) has been fixed in #33128 by @DrJohnM in 2.4-develop branch Related commits: 1. 4265688 2. 54630ee 3. d2e11d0 4. db69078 5. 3937246 6. 830595e - #32615: Add assign customer to cart mutation (reported by @oneserv-heuser) has been fixed in #33106 by @khrystynastolbova in 2.4-develop branch Related commits: 1. 36971ef 2. 9ced6e0 3. 6daaf31 - #33984: [Issue] Move catalog search indexer outside stores loop (reported by @m2-assistant[bot]) has been fixed in #33227 by @jasperzeinstra in 2.4-develop branch Related commits: 1. 1775766 2. 59ee3e6 3. c00c77c - #30567: Get Product Url function is returning a url with 301 redirect type instead of url with redirect type of 0 (reported by @amine-y) has been fixed in #30580 by @amine-y in 2.4-develop branch Related commits: 1. 1539189 2. 7e943d8 - #30580: Fixing getUrl() function (reported by @amine-y) has been fixed in #30580 by @amine-y in 2.4-develop branch Related commits: 1. 1539189 2. 7e943d8 - #30948: Graphql - issue adding multiple configurable products to cart (reported by @cdiacon-img) has been fixed in #31654 by @nige-one in 2.4-develop branch Related commits: 1. 0b56c80 2. f46aa23 3. 6dc64d4 4. 8fcc285
2 parents 2e03629 + 4a87249 commit 177254d

File tree

77 files changed

+2178
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2178
-198
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<comment userInput="Go to checkout" stepKey="goToCheckout"/>
6565
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
6666
<waitForLoadingMaskToDisappear stepKey="waitForLoadingCheckoutPageWithShippingMethod"/>
67-
<click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
68-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask1"/>
67+
<actionGroup ref="StorefrontSelectFirstShippingMethodActionGroup" stepKey="selectFirstShippingMethod"/>
68+
<comment userInput="Adding the comment to replace waitForLoadingMask1 action for preserving Backward Compatibility" stepKey="waitForLoadingMask1"/>
6969
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
7070
<!-- Checkout select Check/Money Order payment -->
7171
<comment userInput="Select Check/Money payment" stepKey="checkoutSelectCheckMoneyPayment"/>

‎app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertStorefrontCaptchaVisibleOnCustomerSignInPopupActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertStorefrontCaptchaVisibleOnCustomerSignInPopupActionGroup">
12+
<annotations>
13+
<description>Validate that the Captcha IS present on the Storefront Customer Sign In Popup.</description>
14+
</annotations>
15+
16+
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="waitToSeeCaptchaField"/>
17+
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaImg}}" stepKey="waitToSeeCaptchaImage"/>
18+
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButton"/>
19+
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="CaptchaWithDisabledGuestCheckoutTest">
1111
<annotations>
1212
<features value="Captcha"/>
@@ -33,29 +33,42 @@
3333
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3434
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct1"/>
3535
</after>
36-
<amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="openProductPage"/>
37-
<waitForPageLoad stepKey="waitForPageLoad"/>
36+
37+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
38+
<argument name="productUrl" value="$$createSimpleProduct.sku$$"/>
39+
</actionGroup>
40+
41+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad"/>
3842
<actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
39-
<waitForText userInput="You added $$createSimpleProduct.name$$ to your shopping cart." stepKey="waitForText"/>
40-
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart"/>
41-
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
42-
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible"/>
43-
<fillField selector="{{StorefrontCustomerSignInPopupFormSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail"/>
44-
<fillField selector="{{StorefrontCustomerSignInPopupFormSection.password}}" userInput="incorrectPassword" stepKey="fillIncorrectCustomerPassword"/>
45-
<click selector="{{StorefrontCustomerSignInPopupFormSection.signIn}}" stepKey="clickSignIn"/>
43+
44+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForText"/>
45+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickCart"/>
46+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout"/>
47+
48+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitEmailFieldVisible"/>
49+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillCustomerEmail"/>
50+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillIncorrectCustomerPassword"/>
51+
<actionGroup ref="StorefrontCustomerSignInPopUpActionGroup" stepKey="clickSignIn">
52+
<argument name="customerEmail" value="{{Simple_US_Customer.email}}"/>
53+
<argument name="customerPwd" value="incorrectPassword"/>
54+
</actionGroup>
55+
4656
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.errorMessage}}" stepKey="seeErrorMessage"/>
47-
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="seeCaptchaField"/>
48-
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
49-
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
57+
58+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeCaptchaField"/>
59+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeCaptchaImage"/>
60+
<actionGroup ref="AssertStorefrontCaptchaVisibleOnCustomerSignInPopupActionGroup" stepKey="seeCaptchaReloadButton"/>
5061

5162
<actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
52-
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForPageLoad2" />
63+
<comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForPageLoad2"/>
64+
65+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickCart2"/>
66+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout2"/>
5367

54-
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart2"/>
55-
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout2"/>
5668
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible2"/>
57-
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="seeCaptchaField2"/>
58-
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
59-
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
69+
70+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeCaptchaField2"/>
71+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeCaptchaImage2"/>
72+
<actionGroup ref="AssertStorefrontCaptchaVisibleOnCustomerSignInPopupActionGroup" stepKey="seeCaptchaReloadButton2"/>
6073
</test>
6174
</tests>

‎app/code/Magento/Catalog/Model/Product/Url.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class Url extends \Magento\Framework\DataObject
3030
protected $filter;
3131

3232
/**
33-
* Store manager
34-
*
3533
* @var \Magento\Store\Model\StoreManagerInterface
3634
*/
3735
protected $storeManager;
@@ -151,6 +149,7 @@ public function getUrl(\Magento\Catalog\Model\Product $product, $params = [])
151149
UrlRewrite::ENTITY_ID => $product->getId(),
152150
UrlRewrite::ENTITY_TYPE => \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::ENTITY_TYPE,
153151
UrlRewrite::STORE_ID => $storeId,
152+
UrlRewrite::REDIRECT_TYPE => 0
154153
];
155154
$useCategories = $this->scopeConfig->getValue(
156155
\Magento\Catalog\Helper\Product::XML_PATH_PRODUCT_URL_USE_CATEGORY,

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSelectPermanentRedirectCheckBoxActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSelectPermanentRedirectCheckBoxActionGroup" extends="ChangeSeoUrlKeyActionGroup">
12+
<annotations>
13+
<description>EXTENDS: ChangeSeoUrlKeyActionGroup. Select "Create Permanent Redirect for old URL" option</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="value" type="string"/>
17+
</arguments>
18+
19+
<checkOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="checkPermanentRedirectCheckBox" after="enterURLKey"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSelectWeightTypeOnProductFormActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSelectWeightTypeOnProductFormActionGroup">
12+
<annotations>
13+
<description>Select Weight type on the Admin Products creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="weightOption" type="string" defaultValue="This item has no weight"/>
17+
</arguments>
18+
<selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="{{weightOption}}" stepKey="selectWeight"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUncheckPermanentRedirectCheckBoxActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminUncheckPermanentRedirectCheckBoxActionGroup" extends="ChangeSeoUrlKeyActionGroup">
12+
<annotations>
13+
<description>EXTENDS: ChangeSeoUrlKeyActionGroup. Uncheck "Create Permanent Redirect for old URL" option</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="value" type="string"/>
17+
</arguments>
18+
19+
<uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="uncheckPermanentRedirectCheckBox" after="enterURLKey"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -44,48 +44,56 @@
4444

4545
<!-- Open 3rd Level category -->
4646
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
47-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createThreeLevelNestedCategories.name$$)}}" stepKey="selectCategory"/>
48-
<waitForPageLoad stepKey="waitForPageToLoad"/>
47+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCategory">
48+
<argument name="category" value="$$createThreeLevelNestedCategories$$"/>
49+
</actionGroup>
50+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad"/>
4951

5052
<!--Update category UrlKey and uncheck permanent redirect for old URL -->
51-
<scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
52-
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
53-
<waitForPageLoad stepKey="waitForPageToLoad1"/>
54-
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="updatedurl" stepKey="updateUrlKey"/>
55-
<uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="uncheckPermanentRedirectCheckBox"/>
56-
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
57-
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveUpdatedCategory"/>
58-
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
53+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToSearchEngineOptimization1"/>
54+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectSearchEngineOptimization"/>
55+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad1"/>
56+
<actionGroup ref="AdminUncheckPermanentRedirectCheckBoxActionGroup" stepKey="updateUrlKey">
57+
<argument name="value" value="updatedurl"/>
58+
</actionGroup>
59+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="uncheckPermanentRedirectCheckBox"/>
60+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectSearchEngineOptimization1"/>
61+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="saveUpdatedCategory"/>
62+
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="seeSuccessMessage"/>
5963

6064
<!-- Get Category Id -->
6165
<grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
6266

6367
<!-- Open Url Rewrite Page -->
64-
<amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
65-
<waitForPageLoad stepKey="waitForUrlRewritePage"/>
68+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="openUrlRewriteIndexPage"/>
69+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForUrlRewritePage"/>
6670

6771
<!-- Verify third level category's Redirect Path, Target Path and Redirect Type after the URL Update -->
68-
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}"
69-
dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}"
70-
visible="true"
71-
stepKey="clickOnResetButton"/>
72-
<waitForPageLoad stepKey="waitForPageToLoad0"/>
73-
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters"/>
74-
<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="updatedurl" stepKey="fillUpdatedUrlInRedirectPathFilter"/>
75-
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
76-
<waitForPageLoad stepKey="waitForPageToLoad2"/>
77-
<see stepKey="seeTheRedirectType" selector="{{AdminUrlRewriteIndexSection.gridCellByColumnRowNumber('1', 'Redirect Type')}}" userInput="No" />
78-
<see stepKey="seeTheTargetPath" selector="{{AdminUrlRewriteIndexSection.gridCellByColumnRowNumber('1', 'Target Path')}}" userInput="catalog/category/view/id/{$categoryId}"/>
79-
<see selector="{{AdminUrlRewriteIndexSection.gridCellByColumnRowNumber('1', 'Request Path')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updatedurl.html" stepKey="seeTheRedirectPath"/>
72+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnResetButton"/>
73+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad0"/>
74+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="openUrlRewriteGridFilters"/>
75+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillUpdatedUrlInRedirectPathFilter"/>
76+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOrderApplyFilters"/>
77+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad2"/>
78+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeTheRedirectType"/>
79+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeTheTargetPath"/>
80+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeTheRedirectPath"/>
81+
<actionGroup ref="AdminSearchByRequestPathActionGroup" stepKey="searchByRequestPath">
82+
<argument name="redirectPath" value="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updatedurl.html" />
83+
<argument name="redirectType" value="No" />
84+
<argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
85+
</actionGroup>
8086

8187
<!-- Verify third level category's old URL path doesn't show redirect path-->
8288
<actionGroup ref="AdminClearGridFiltersActionGroup" stepKey="clickOnResetButton1"/>
8389
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad3"/>
84-
85-
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters1"/>
86-
<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="{{Three_nested_categories.name_lwr}}" stepKey="fillOldUrlInRedirectPathFilter"/>
87-
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters1"/>
88-
<waitForPageLoad stepKey="waitForPageToLoad4"/>
89-
<see stepKey="seeEmptyRecodsMessage" selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records."/>
90+
<actionGroup ref="AdminSearchDeletedUrlRewriteActionGroup" stepKey="searcOldUrlRewriteInGrid">
91+
<argument name="requestPath" value="{{Three_nested_categories.name_lwr}}"/>
92+
</actionGroup>
93+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="openUrlRewriteGridFilters1"/>
94+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillOldUrlInRedirectPathFilter"/>
95+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOrderApplyFilters1"/>
96+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad4"/>
97+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeEmptyRecodsMessage"/>
9098
</test>
9199
</tests>

0 commit comments

Comments
 (0)