Skip to content

Commit 1e32555

Browse files
alzotaalzota
committed
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-1753
2 parents 24735fc + 9d751c5 commit 1e32555

File tree

32 files changed

+821
-89
lines changed

32 files changed

+821
-89
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686

8787
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCart"/>
8888

89-
<see selector="{{StorefrontBundledSection.nthItemOptionsValue('1')}}" userInput="1 x $$SimpleProduct1.name$$ $10.00" stepKey="seeOptionValue1"/>
90-
<see selector="{{StorefrontBundledSection.nthItemOptionsValue('2')}}" userInput="1 x $$SimpleProduct2.name$$ $15.00" stepKey="seeOptionValue2"/>
89+
<waitForText selector="{{StorefrontBundledSection.nthItemOptionsValue('1')}}" userInput="1 x $$SimpleProduct1.name$$ $10.00" stepKey="seeOptionValue1"/>
90+
<waitForText selector="{{StorefrontBundledSection.nthItemOptionsValue('2')}}" userInput="1 x $$SimpleProduct2.name$$ $15.00" stepKey="seeOptionValue2"/>
9191

9292
<openNewTab stepKey="openNewTab"/>
9393

@@ -115,12 +115,12 @@
115115
</actionGroup>
116116

117117
<click stepKey="clickEdit" selector="{{CheckoutCartProductSection.nthEditButton('1')}}"/>
118-
118+
<waitForElementClickable selector="{{StorefrontProductInfoMainSection.updateCart}}" stepKey="waitForUpdateCartButtonClickable" />
119119
<click selector="{{StorefrontProductInfoMainSection.updateCart}}" stepKey="clickUpdateCartButton"/>
120-
120+
<waitForElementClickable selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="waitForProceedToCheckoutClickable" />
121121
<click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
122122

123-
<see selector="{{CheckoutHeaderSection.shippingMethodStep}}" userInput="Shipping" stepKey="checkShippingHeader"/>
123+
<waitForText selector="{{CheckoutHeaderSection.shippingMethodStep}}" userInput="Shipping" stepKey="checkShippingHeader"/>
124124

125125
</test>
126126
</tests>

‎app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* See COPYING.txt for license details.
55
*/
66
use Magento\Bundle\ViewModel\ValidateQuantity;
7+
8+
// phpcs:disable Generic.Files.LineLength.TooLong
79
?>
810
<?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio */ ?>
911
<?php $_option = $block->getOption(); ?>
@@ -49,8 +51,7 @@ $viewModel = $block->getData('validateQuantityViewModel');
4951
<div class="field choice">
5052
<input type="radio"
5153
class="radio product bundle option change-container-classname"
52-
id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>
53-
-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
54+
id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
5455
<?php if ($_option->getRequired()) {
5556
echo 'data-validate="{\'validate-one-required-by-name\':true}"';
5657
} ?>
@@ -61,8 +62,7 @@ $viewModel = $block->getData('validateQuantityViewModel');
6162
value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
6263
data-errors-message-box="#validation-message-box-radio"/>
6364
<label class="label"
64-
for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>
65-
-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
65+
for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
6666
<span><?= /* @noEscape */ $block->getSelectionTitlePrice($_selection) ?></span>
6767
<br/>
6868
<?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
</before>
2525
<after>
2626
<deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
27+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductGridPage" />
28+
<actionGroup ref="AdminDeleteAllProductsFromGridActionGroup" stepKey="deleteProducts" />
2729
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2830
</after>
2931

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

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontProductImageSlideTest">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<stories value="Product Image"/>
15+
<title value="Product image should be visible and slide left or right on frontend in mobile"/>
16+
<description value="Product image should be visible and slide left or right on frontend in mobile"/>
17+
<group value="Catalog"/>
18+
<severity value="AVERAGE"/>
19+
<testCaseId value="AC-8441"/>
20+
</annotations>
21+
<before>
22+
<resizeWindow width="800" height="700" stepKey="resizeWindowToMobileView"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
</before>
25+
<after>
26+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
27+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
28+
<argument name="sku" value="{{SimpleProduct.sku}}"/>
29+
</actionGroup>
30+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
31+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsAdmin"/>
32+
</after>
33+
34+
<!--Create product-->
35+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="openNewProductPage"/>
36+
<actionGroup ref="FillMainProductFormActionGroup" stepKey="fillSimpleProductMain">
37+
<argument name="product" value="SimpleProduct"/>
38+
</actionGroup>
39+
40+
<!-- Add image to product -->
41+
<actionGroup ref="AddProductImageActionGroup" stepKey="addImageForSimpleProduct">
42+
<argument name="image" value="TestImageWithDotInFilename"/>
43+
</actionGroup>
44+
<actionGroup ref="AddProductImageActionGroup" stepKey="addImageForSimpleProduct2">
45+
<argument name="image" value="TestImageWithDotInFilename"/>
46+
</actionGroup>
47+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
48+
49+
<!-- Assert product in storefront product page -->
50+
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageActionGroup" stepKey="assertProductInStorefrontProductPage">
51+
<argument name="product" value="SimpleProduct"/>
52+
</actionGroup>
53+
54+
<click selector="{{StorefrontProductMediaSection.fotoramaImageThumbnail('2')}}" stepKey="clickForFullScreenImage1"/>
55+
<wait stepKey="waitForImageScroll" time="2"/>
56+
<waitForElementVisible selector="{{StorefrontProductMediaSection.imagePrevButton}}" stepKey="waitPrevButton"/>
57+
<seeElement selector="{{StorefrontProductMediaSection.imagePrevButton}}" stepKey="seePrevButton"/>
58+
</test>
59+
</tests>

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
<click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn"/>
2424
<waitForElementVisible selector="{{payPalConfigType.enableSolution(countryCode)}}" stepKey="waitForWPSExpressEnable"/>
2525
<selectOption selector="{{payPalConfigType.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableWPSExpressSolution"/>
26+
<wait time="2" stepKey="waitForPopupToAppear" />
2627
<seeInPopup userInput="There is already another PayPal solution enabled. Enable this solution instead?" stepKey="seeAlertMessage"/>
2728
<acceptPopup stepKey="acceptEnablePopUp"/>
29+
<waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForSaveConfigClickable" />
2830
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
2931
<waitForPageLoad stepKey="waitForPageLoad2"/>
3032
</actionGroup>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInFranceTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country France"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-16675"/>
18+
<group value="pr_exclude" />
1819
<group value="paypal"/>
1920
</annotations>
2021
<selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="France" stepKey="setMerchantCountry"/>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInItalyTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Italy"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-16677"/>
18+
<group value="pr_exclude" />
1819
<group value="paypal"/>
1920
<group value="cloud"/>
2021
</annotations>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInJapanTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Japan"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-13146"/>
18+
<group value="pr_exclude" />
1819
<group value="paypal"/>
1920
<group value="cloud"/>
2021
</annotations>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInSpainTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Spain"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-16678"/>
18+
<group value="pr_exclude" />
1819
<group value="paypal"/>
1920
<group value="cloud"/>
2021
</annotations>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<field key="price">100</field>
2525
</createData>
2626
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
27-
<createData entity="DisableFlatRateShippingMethodConfig" stepKey="disableFlatRate"/>
27+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
2828
<createData entity="FreeShippinMethodConfig" stepKey="enableFreeShippingMethod"/>
2929
<createData entity="setFreeShippingSubtotal" stepKey="setFreeShippingSubtotal"/>
3030
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -34,7 +34,7 @@
3434
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3535
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3636
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
37-
<createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
37+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
3838
<createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
3939
<createData entity="setFreeShippingSubtotalToDefault" stepKey="setFreeShippingSubtotalToDefault"/>
4040
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

0 commit comments

Comments
 (0)