Skip to content

Commit 42b4e80

Browse files
sidolovsidolov
authored
Merge branch '2.4-develop' into beta-sync
2 parents fc63dbc + 262abfe commit 42b4e80

20 files changed

+257
-90
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<description value="Print Order from Guest on Frontend"/>
1616
<severity value="BLOCKER"/>
1717
<testCaseId value="MC-38689"/>
18-
<skip>
19-
<issueId value="MQE-2834" />
20-
</skip>
2118
<group value="remote_storage_aws_s3"/>
2219
<group value="pr_exclude"/>
2320
</annotations>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml

+15-6
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@
4949
<actionGroup ref="AdminOpenProductImagesSectionActionGroup" stepKey="expandImages"/>
5050

5151
<!-- Upload and set Base image -->
52-
<attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="adobe-base.jpg" stepKey="attach1"/>
53-
<waitForPageLoad stepKey="waitForUpload1"/>
52+
<actionGroup ref="AddProductImageActionGroup" stepKey="attach1">
53+
<argument name="image" value="TestImageAdobe"/>
54+
</actionGroup>
55+
<comment userInput="BIC workaround" stepKey="waitForUpload1"/>
56+
<waitForElementVisible selector="{{AdminProductImagesSection.nthProductImage('1')}}" stepKey="waitForOpenImageDetails1"/>
5457
<click selector="{{AdminProductImagesSection.nthProductImage('1')}}" stepKey="openImageDetails1"/>
5558
<waitForPageLoad stepKey="waitForSlideout1"/>
5659
<conditionalClick selector="{{AdminProductImagesSection.roleBase}}" dependentSelector="{{AdminProductImagesSection.isBaseSelected}}" visible="false" stepKey="base1"/>
@@ -61,8 +64,11 @@
6164
<waitForPageLoad stepKey="waitForHide1"/>
6265

6366
<!-- Upload and set Small image -->
64-
<attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="adobe-small.jpg" stepKey="attach2"/>
65-
<waitForPageLoad stepKey="waitForUpload2"/>
67+
<actionGroup ref="AddProductImageActionGroup" stepKey="attach2">
68+
<argument name="image" value="AdobeSmallImage"/>
69+
</actionGroup>
70+
<comment userInput="BIC workaround" stepKey="waitForUpload2"/>
71+
<waitForElementVisible selector="{{AdminProductImagesSection.nthProductImage('2')}}" stepKey="waitForOpenImageDetails2"/>
6672
<click selector="{{AdminProductImagesSection.nthProductImage('2')}}" stepKey="openImageDetails2"/>
6773
<waitForPageLoad stepKey="waitForSlideout2"/>
6874
<conditionalClick selector="{{AdminProductImagesSection.roleBase}}" dependentSelector="{{AdminProductImagesSection.isBaseSelected}}" visible="true" stepKey="base2"/>
@@ -73,8 +79,11 @@
7379
<waitForPageLoad stepKey="waitForHide2"/>
7480

7581
<!-- Upload and set Thumbnail image -->
76-
<attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="adobe-thumb.jpg" stepKey="attach3"/>
77-
<waitForPageLoad stepKey="waitForUpload3"/>
82+
<actionGroup ref="AddProductImageActionGroup" stepKey="attach3">
83+
<argument name="image" value="AdobeThumbImage"/>
84+
</actionGroup>
85+
<comment userInput="BIC workaround" stepKey="waitForUpload3"/>
86+
<waitForElementVisible selector="{{AdminProductImagesSection.nthProductImage('3')}}" stepKey="waitForOpenImageDetails3"/>
7887
<click selector="{{AdminProductImagesSection.nthProductImage('3')}}" stepKey="openImageDetails3"/>
7988
<waitForPageLoad stepKey="waitForSlideout3"/>
8089
<conditionalClick selector="{{AdminProductImagesSection.roleBase}}" dependentSelector="{{AdminProductImagesSection.isBaseSelected}}" visible="true" stepKey="base3"/>

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

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<createData entity="SimpleProduct" stepKey="simpleProduct">
2323
<requiredEntity createDataKey="defaultCategory"/>
2424
</createData>
25+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
26+
<argument name="indices" value=""/>
27+
</actionGroup>
2528
</before>
2629
<after>
2730
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</before>
3737
<after>
3838
<!-- delete the simple product and catalog price rule and logout -->
39-
<amOnPage stepKey="goToPriceRulePage" url="admin/catalog_rule/promo_catalog/"/>
39+
<amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
4040
<actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
4141
<argument name="name" value="{{_defaultCatalogRule.name}}"/>
4242
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

‎app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/AdminCategoryRestrictedUrlMessageData.xml

+1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
<data key="urlRest">URL key "rest" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.</data>
1515
<data key="urlGraphql">URL key "graphql" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.</data>
1616
<data key="urlAdminError">URL key "admin" matches a reserved endpoint name (admin). Use another URL key.</data>
17+
<data key="urlAdminPartialError">URL key "admin" matches a reserved endpoint name </data>
1718
</entity>
1819
</entities>

‎app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminCategoryWithRestrictedUrlKeyNotCreatedTest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
<argument name="categoryName" value="admin"/>
4747
<argument name="categoryUrlKey" value=""/>
4848
</actionGroup>
49-
<see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlAdminError}}' stepKey="seeAdminFirstErrorMessage"/>
49+
<see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlAdminPartialError}}' stepKey="seeAdminFirstErrorMessage"/>
5050
<actionGroup ref="FillCategoryNameAndUrlKeyAndSaveActionGroup" stepKey="fillAdminSecondCategoryForm">
5151
<argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
5252
<argument name="categoryUrlKey" value="admin"/>
5353
</actionGroup>
54-
<see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlAdminError}}' stepKey="seeAdminSecondErrorMessage"/>
54+
<see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlAdminPartialError}}' stepKey="seeAdminSecondErrorMessage"/>
5555
<!--Create category with 'admin' name-->
5656
<comment userInput="Create category with 'admin' name" stepKey="commentAdminCategoryCreation"/>
5757
<actionGroup ref="FillCategoryNameAndUrlKeyAndSaveActionGroup" stepKey="fillAdminThirdCategoryForm">

‎app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml

+25-23
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<description value="To be sure that other elements of Success page are shown for placed order as registered Customer."/>
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MC-16488"/>
18-
<skip>
19-
<issueId value="MQE-2834" />
20-
</skip>
2118
<group value="checkout"/>
2219
<group value="pr_exclude"/>
2320
</annotations>
@@ -30,7 +27,7 @@
3027
</before>
3128

3229
<after>
33-
<!--Cancel orders-->
30+
<!-- Cancel orders -->
3431
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
3532
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="goToOrdersPage"/>
3633
<actionGroup ref="AdminGridColumnShowActionGroup" stepKey="showCustomerEmailColumn">
@@ -46,35 +43,35 @@
4643
</actionGroup>
4744
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
4845

49-
<!--Logout from customer account-->
46+
<!-- Logout from customer account -->
5047
<amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="logoutCustomerOne"/>
5148
<waitForPageLoad stepKey="waitLogoutCustomerOne"/>
5249
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
5350
<deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
5451
</after>
5552

56-
<!--Log in to Storefront as Customer-->
53+
<!-- Log in to Storefront as Customer -->
5754
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUpNewUser">
5855
<argument name="Customer" value="$$createSimpleUsCustomer$$"/>
5956
</actionGroup>
6057

61-
<!--Go to product page-->
58+
<!-- Go to product page -->
6259
<amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
6360
<waitForPageLoad stepKey="waitForCatalogPageLoad"/>
6461

65-
<!--Add Product to Shopping Cart-->
62+
<!-- Add Product to Shopping Cart -->
6663
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
6764
<argument name="productName" value="$$createSimpleProduct.name$$"/>
6865
</actionGroup>
6966

70-
<!--Go to Checkout-->
67+
<!-- Go to Checkout -->
7168
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
7269
<actionGroup ref="StorefrontSelectFirstShippingMethodActionGroup" stepKey="selectFirstShippingMethod"/>
7370
<comment userInput="Adding the comment to replace waitForLoadingMask2 action for preserving Backward Compatibility" stepKey="waitForLoadingMask2"/>
7471
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
7572
<!-- Checkout select Check/Money Order payment -->
7673
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
77-
<!--Click Place Order button-->
74+
<!-- Click Place Order button -->
7875
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
7976
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessTitle"/>
8077
<see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order number is: " stepKey="seeOrderNumber"/>
@@ -83,40 +80,40 @@
8380
<click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
8481
<seeInCurrentUrl url="{{StorefrontCustomerOrderPage.url}}" stepKey="seeMyOrderPage"/>
8582

86-
<!--Go to product page-->
83+
<!-- Go to product page -->
8784
<amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage2"/>
8885
<waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
8986

90-
<!--Add Product to Shopping Cart-->
87+
<!-- Add Product to Shopping Cart -->
9188
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage2">
9289
<argument name="productName" value="$$createSimpleProduct.name$$"/>
9390
</actionGroup>
9491

95-
<!--Go to Checkout-->
92+
<!-- Go to Checkout -->
9693
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2"/>
9794
<actionGroup ref="StorefrontSelectFirstShippingMethodActionGroup" stepKey="selectFirstShippingMethod2"/>
9895
<comment userInput="Adding the comment to replace waitForLoadingMask3 action for preserving Backward Compatibility" stepKey="waitForLoadingMask3"/>
9996
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext2"/>
10097
<!-- Checkout select Check/Money Order payment -->
10198
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
10299

103-
<!--Click Place Order button-->
100+
<!-- Click Place Order button -->
104101
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
105102
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage2"/>
106103
<click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
107104
<see userInput="Home Page" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeHomePageTitle"/>
108105
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="seeHomePageUrl"/>
109106

110-
<!--Go to product page-->
107+
<!-- Go to product page -->
111108
<amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage3"/>
112109
<waitForPageLoad stepKey="waitForCatalogPageLoad3"/>
113110

114-
<!--Add Product to Shopping Cart-->
111+
<!-- Add Product to Shopping Cart -->
115112
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage3">
116113
<argument name="productName" value="$$createSimpleProduct.name$$"/>
117114
</actionGroup>
118115

119-
<!--Go to Checkout-->
116+
<!-- Go to Checkout -->
120117
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart3"/>
121118
<actionGroup ref="StorefrontSelectFirstShippingMethodActionGroup" stepKey="selectFirstShippingMethod3"/>
122119
<comment userInput="Adding the comment to replace waitForLoadingMask4 action for preserving Backward Compatibility" stepKey="waitForLoadingMask4"/>
@@ -125,11 +122,11 @@
125122
<!-- Checkout select Check/Money Order payment -->
126123
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment3"/>
127124

128-
<!--Click Place Order button-->
125+
<!-- Click Place Order button -->
129126
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder3"/>
130127
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage3"/>
131128

132-
<!--Check "Print Receipt" button is presented (desktop only)-->
129+
<!-- Check "Print Receipt" button is presented (desktop only) -->
133130
<seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint"/>
134131
<resizeWindow width="600" height="800" stepKey="resizeWindow"/>
135132
<waitForElementNotVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitInvisiblePrint"/>
@@ -138,11 +135,16 @@
138135
<waitForElementVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitVisiblePrint"/>
139136
<seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint2"/>
140137

141-
<!--See print page-->
138+
<!-- See print page -->
142139
<click selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="clickPrintLink"/>
143-
<switchToWindow stepKey="switchToWindow"/>
144-
<switchToNextTab stepKey="switchToTab"/>
145-
<seeInCurrentUrl url="sales/order/print/order_id" stepKey="seePrintPage"/>
140+
<helper class="Magento\Sales\Test\Mftf\Helper\SalesHelper" method="switchToWindowWithUrlAndClosePrintDialogIfEncountered" stepKey="switchToWindowWithUrlAndClosePrintDialogIfEncountered">
141+
<argument name="expectedUrl">sales/order/print/order_id/</argument>
142+
<argument name="expectedUrlComparisonType">COMPARISON_PATH_SUBSET_MATCH</argument>
143+
</helper>
144+
145+
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchToWindow"/>
146+
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchToTab"/>
147+
<comment userInput="Step key preserved for backwards compatibility" stepKey="seePrintPage"/>
146148
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="seeOrderTitleOnPrint"/>
147149
<switchToWindow stepKey="switchToWindow2"/>
148150
</test>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AddSimpleProductToOrderActionGroup.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@
2222
<click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearch"/>
2323
<scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
2424
<checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
25+
<waitForPageLoad stepKey="waitForProductLoad"/>
2526
<fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
2627
<scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
2728
<click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
28-
<waitForLoadingMaskToDisappear stepKey="waitForOptionsToLoad"/>
29+
<waitForPageLoad stepKey="waitForOptionsToLoad"/>
2930
</actionGroup>
3031
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAddSimpleProductWithCustomOptionFileToOrderActionGroup.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616
</arguments>
1717

1818
<remove keyForRemoval="fillProductQty"/>
19-
<waitForAjaxLoad stepKey="waitForAjaxLoad" after="selectProduct"/>
20-
<fillField selector="{{AdminOrderFormCustomOptionsSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty" after="waitForAjaxLoad"/>
19+
<comment userInput="BIC workaround" stepKey="waitForAjaxLoad" after="waitForProductLoad"/>
20+
<waitForElementVisible selector="{{AdminOrderFormCustomOptionsSection.quantity}}" stepKey="waitForProductQty" after="waitForAjaxLoad"/>
21+
<fillField selector="{{AdminOrderFormCustomOptionsSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty" after="waitForProductQty"/>
2122
<attachFile selector="{{AdminOrderFormCustomOptionsSection.file}}" userInput="{{file}}" stepKey="attachImageForOptional" after="fillProductQty"/>
22-
<click selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="clickButtonOK" after="attachImageForOptional"/>
23+
<waitForPageLoad stepKey="waitForImageUploaded" after="attachImageForOptional"/>
24+
<click selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="clickButtonOK" after="waitForImageUploaded"/>
25+
<waitForPageLoad stepKey="waitForSlideOutGone" after="clickButtonOK"/>
26+
<waitForElementNotVisible selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="waitForOkButtonGone" after="waitForSlideOutGone"/>
2327
</actionGroup>
2428
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminChangeCustomerOptionFileActionGroup.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@
1212
<description>Change custom option file on admin order page.</description>
1313
</annotations>
1414
<arguments>
15-
<argument name="file" type="string" defaultValue="{{TestImageNew.file}}" />
15+
<argument name="file" type="string" defaultValue="{{TestImageNew.file}}"/>
1616
</arguments>
1717

1818
<click selector="{{AdminOrderFormItemsSection.configure}}" stepKey="clickConfigure"/>
19-
<waitForAjaxLoad stepKey="waitForAjaxLoad"/>
19+
<waitForPageLoad stepKey="waitForAjaxLoad"/>
20+
<waitForElementVisible selector="{{AdminOrderFormCustomOptionsSection.linkChange}}" stepKey="waitForLinkChange"/>
2021
<click selector="{{AdminOrderFormCustomOptionsSection.linkChange}}" stepKey="clickLinkChange"/>
2122
<waitForPageLoad stepKey="waitForChangeLoad"/>
23+
<waitForElementVisible selector="{{AdminOrderFormCustomOptionsSection.file}}" stepKey="waitForAttachImage"/>
2224
<attachFile selector="{{AdminOrderFormCustomOptionsSection.file}}" userInput="{{file}}" stepKey="changeAttachImage"/>
25+
<waitForPageLoad stepKey="waitForImageUploaded"/>
2326
<click selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="clickButtonOK"/>
2427
<waitForPageLoad stepKey="waitForCustomOptionApplied"/>
28+
<waitForElementNotVisible selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="waitForOkButtonGone"/>
2529
</actionGroup>
2630
</actionGroups>

0 commit comments

Comments
 (0)