Skip to content

Commit 7fd5bed

Browse files
paras89paras89
committed
Merge branch '2.4-develop' of github.com:magento/magento2 into PB-500
2 parents a224874 + 9b1016b commit 7fd5bed

File tree

374 files changed

+8148
-4103
lines changed

Some content is hidden

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

374 files changed

+8148
-4103
lines changed

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3MediaGalleryDeleteFolderTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<argument name="name" value="{{AdminMediaGalleryFolder2Data.name}}"/>
9090
</actionGroup>
9191
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectUploadedImage">
92-
<argument name="imageName" value="{{ImageUpload.file}}"/>
92+
<argument name="imageName" value="{{ImageUpload.filename}}"/>
9393
</actionGroup>
9494
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelected"/>
9595
<actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="savePage"/>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3MediaGalleryDeleteImageTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
8383
</actionGroup>
8484
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectUploadedImage">
85-
<argument name="imageName" value="{{ImageUpload.file}}"/>
85+
<argument name="imageName" value="{{ImageUpload.filename}}"/>
8686
</actionGroup>
8787
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelected"/>
8888
<actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="savePage"/>
@@ -117,7 +117,7 @@
117117
<argument name="imageName" value="{{ImageUpload.file}}"/>
118118
</actionGroup>
119119
<actionGroup ref="AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup" stepKey="assertImageDeleted">
120-
<argument name="title" value="ImageUpload.file"/>
120+
<argument name="title" value="ImageUpload.filename"/>
121121
</actionGroup>
122122

123123
<!-- Verify Images & Directories in S3 & Local File System -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminCreateDownloadableProductWithLinkTest.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,16 @@
161161
<comment userInput="BIC workaround" stepKey="waitForPaymentSectionLoaded"/>
162162
<comment userInput="BIC workaround" stepKey="clickPlaceOrderButton"/>
163163
<comment userInput="BIC workaround" stepKey="orderIsSuccessfullyPlaced"/>
164-
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
164+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="clickOrderLink"/>
165+
<comment userInput="BIC workaround" stepKey="grabOrderNumber"/>
166+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="orderId"/>
165167

166168
<!-- Open Create invoice -->
167169
<comment userInput="BIC workaround" stepKey="onOrdersPage"/>
168170
<comment userInput="BIC workaround" stepKey="searchOrder"/>
169171
<comment userInput="BIC workaround" stepKey="clickOrderRow"/>
170-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="goToOrderInAdmin">
171-
<argument name="orderId" value="{$grabOrderNumber}"/>
172+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="goToOrderInAdmin">
173+
<argument name="entityId" value="{$orderId}"/>
172174
</actionGroup>
173175
<comment userInput="BIC workaround" stepKey="createCreditMemo"/>
174176
<actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startInvoice"/>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenDashboardPageActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="AdminOpenDashboardPageActionGroup">
12+
<annotations>
13+
<description>Go to Admin Dashboard page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminDashboardPage.url}}" stepKey="goToDashboardPage"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
<!-- delete the rule -->
3030
<click stepKey="clickDelete" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
3131
<click stepKey="clickOk" selector="{{AdminConfirmationModalSection.ok}}"/>
32-
<see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="deleted"/>
32+
<see stepKey="seeSuccess" selector="{{AdminMessagesSection.success}}" userInput="deleted"/>
3333
</actionGroup>
3434
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
<!-- Used for page not found error -->
1919
<element name="pageNotFoundTitle" type="text" selector=".page-title span"/>
2020
<element name="signOut" type="button" selector=".page-header .account-signout"/>
21+
<element name="pageMainActions" type="block" selector=".page-main-actions"/>
2122
</section>
2223
</sections>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ script;
303303
script;
304304
endif;
305305

306-
if (strpos($block->getRowClickCallback(), 'order.') !== false):
306+
if ($block->getRowClickCallback() && strpos($block->getRowClickCallback(), 'order.') !== false):
307307
$scriptString .= <<<script
308308
309309
deps.push('Magento_Sales/order/create/form')

‎app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
endif;
2626
?>
2727
<?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' .
28-
(preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
28+
(preg_match('/\s?ajax\s?/', $_tab->getClass() ?? '') ? 'notloaded' : '') ?>
2929
<?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ?
3030
'link' : '' ?>
3131
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' :

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2222
</before>
2323
<after>
24+
<!-- Delete attribute sets -->
25+
<actionGroup ref="DeleteAttributeSetByLabelActionGroup" stepKey="deleteAttributeSet">
26+
<argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
27+
</actionGroup>
28+
<actionGroup ref="DeleteAttributeSetByLabelActionGroup" stepKey="deleteAttributeSet2">
29+
<argument name="label" value="{{ProductAttributeFrontendLabelTwo.label}}"/>
30+
</actionGroup>
31+
<actionGroup ref="AdminClearGridFiltersActionGroup" stepKey="clearGridFilters"/>
2432
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
2533
</after>
2634
<!--Create attribute set-->

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundlePlaceOrderWithMultipleOptionsSuccessTest.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,13 @@
7777
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
7878
<!-- Click place order -->
7979
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
80-
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
80+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="clickOrderLink"/>
81+
<comment userInput="BIC workaround" stepKey="grabOrderNumber"/>
82+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="orderId"/>
8183

8284
<!-- Order review page has address that was created during checkout -->
83-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
84-
<argument name="orderId" value="{$grabOrderNumber}"/>
85+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="filterOrdersGridById">
86+
<argument name="entityId" value="{$orderId}"/>
8587
</actionGroup>
8688

8789
<!-- Open create invoice page -->

0 commit comments

Comments
 (0)