Skip to content

Commit 7d96278

Browse files
aplapanaaplapana
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-3523
2 parents e2a9439 + 6cfb9b6 commit 7d96278

File tree

34 files changed

+650
-79
lines changed

34 files changed

+650
-79
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2018 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -14,7 +14,7 @@
1414
<element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/>
1515
<element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/>
1616
<element name="asLowAsFinalPrice" type="text" selector="div.price-box.price-final_price p.minimal-price > span.price-final_price span.price"/>
17-
<element name="fixedFinalPrice" type="text" selector="div.price-box.price-final_price p.price-from span.price-final_price span.price-wrapper span.price"/>
17+
<element name="fixedFinalPrice" type="text" selector="div.price-box.price-final_price span.price-final_price span.price-wrapper span.price"/>
1818
<element name="productBundleOptionsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/../input" parameterized="true" timeout="30"/>
1919
<element name="productBundleOneOptionInput" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/..//input[contains(@class, 'option')]" parameterized="true" timeout="30"/>
2020
<element name="productBundleOptionQty" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/..//input[contains(@class, 'qty')]" parameterized="true" timeout="30"/>

‎app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2013 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
@@ -68,7 +68,7 @@
6868
</action>
6969
</referenceBlock>
7070
<referenceContainer name="content">
71-
<container name="bundle.options.container" htmlTag="div" htmlClass="bundle-options-container" after="product.info.media"/>
71+
<container name="bundle.options.container" htmlTag="div" htmlClass="bundle-options-container" after="product.info.main"/>
7272
</referenceContainer>
7373
<referenceContainer name="product.info.type">
7474
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="Magento_Bundle::catalog/product/view/type/bundle.phtml"/>

‎app/code/Magento/CatalogInventory/Test/Mftf/Test/StoreFrontAddOutOfStockProductToShoppingCartTest.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -17,6 +17,8 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="AC-5262"/>
1919
<group value="cloud"/>
20+
<!-- Will be fixed in scope of ACQE-7385 -->
21+
<group value="pr_exclude"/>
2022
</annotations>
2123

2224
<before>

‎app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All rights reserved.
55
*/
66
namespace Magento\CatalogSearch\Model\ResourceModel;
77

@@ -64,7 +64,7 @@ protected function _construct()
6464
*/
6565
public function prepareCondition($attribute, $value)
6666
{
67-
$condition = $value;
67+
$condition = false;
6868

6969
if (is_array($value)) {
7070
if ($attribute->getBackendType() == 'varchar') { // multiselect

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductAddToCartErrorMessageActionGroup.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
67
-->
78

89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -11,7 +12,7 @@
1112
<arguments>
1213
<argument name="message" type="string" defaultValue=""/>
1314
</arguments>
14-
<waitForElementVisible selector="{{StorefrontMessagesSection.error}}" stepKey="waitForProductAddedMessage"/>
15-
<see selector="{{StorefrontMessagesSection.error}}" userInput="{{message}}" stepKey="seeAddToCartErrorMessage"/>
15+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProductAddedMessage"/>
16+
<waitForText selector="{{StorefrontMessagesSection.error}}" time="120" userInput="{{message}}" stepKey="seeAddToCartErrorMessage"/>
1617
</actionGroup>
1718
</actionGroups>

‎app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\CheckoutAgreements\Model;
77

@@ -96,11 +96,14 @@ protected function getAgreementsConfig()
9696
$agreementConfiguration['isEnabled'] = (bool)($isAgreementsEnabled && count($agreementsList) > 0);
9797

9898
foreach ($agreementsList as $agreement) {
99+
$isAgreementHtmlType = $agreement->getIsHtml();
99100
$agreementConfiguration['agreements'][] = [
100-
'content' => $agreement->getIsHtml()
101+
'content' => $isAgreementHtmlType
101102
? $agreement->getContent()
102103
: nl2br($this->escaper->escapeHtml($agreement->getContent())),
103-
'checkboxText' => $this->escaper->escapeHtml($agreement->getCheckboxText()),
104+
'checkboxText' => $isAgreementHtmlType
105+
? $agreement->getCheckboxText()
106+
: nl2br($this->escaper->escapeHtml($agreement->getCheckboxText())),
104107
'mode' => $agreement->getMode(),
105108
'agreementId' => $agreement->getAgreementId(),
106109
'contentHeight' => $agreement->getContentHeight()

‎app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -88,7 +88,6 @@ public function testGetConfigIfContentIsHtml(): void
8888
{
8989
$content = 'content';
9090
$checkboxText = 'checkbox_text';
91-
$escapedCheckboxText = 'escaped_checkbox_text';
9291
$mode = AgreementModeOptions::MODE_AUTO;
9392
$agreementId = 100;
9493
$contentHeight = '100px';
@@ -98,7 +97,7 @@ public function testGetConfigIfContentIsHtml(): void
9897
'agreements' => [
9998
[
10099
'content' => $content,
101-
'checkboxText' => $escapedCheckboxText,
100+
'checkboxText' => $checkboxText,
102101
'mode' => $mode,
103102
'agreementId' => $agreementId,
104103
'contentHeight' => $contentHeight
@@ -122,11 +121,6 @@ public function testGetConfigIfContentIsHtml(): void
122121
->with($searchCriteriaMock)
123122
->willReturn([$agreement]);
124123

125-
$this->escaperMock->expects($this->once())
126-
->method('escapeHtml')
127-
->with($checkboxText)
128-
->willReturn($escapedCheckboxText);
129-
130124
$agreement->expects($this->once())->method('getIsHtml')->willReturn(true);
131125
$agreement->expects($this->once())->method('getContent')->willReturn($content);
132126
$agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);

‎app/code/Magento/Config/Test/Mftf/Section/CatalogSection/CatalogSection.xml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
7-
-->
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="CatalogSection">
@@ -25,9 +25,13 @@
2525
<element name="GenerateUrlRewrites" type="select" selector="#catalog_seo_generate_category_product_rewrites"/>
2626
<element name="successMessage" type="text" selector="#messages"/>
2727
<element name="productsPerPageOnGridAllowedValues" type="input" selector="//input[@id='catalog_frontend_grid_per_page_values']"/>
28+
<element name="productsPerPageOnGridAllowedBankTransferPaymentValues" type="input" selector="//input[@id='payment_us_banktransfer_title']"/>
2829
<element name="productsPerPageOnGridDefaultValue" type="input" selector="//input[@id='catalog_frontend_grid_per_page']"/>
2930
<element name="productsPerPageOnGridDefaultValueUseConfigCheckbox" type="checkbox" selector="//input[@id='catalog_frontend_grid_per_page_inherit']"/>
31+
<element name="productsPerPageOnGridBankTransferPaymentDefaultValueUseConfigCheckbox" type="checkbox" selector="//input[@id='payment_us_banktransfer_title_inherit']"/>
3032
<element name="dateAndTimeCustomOptions" type="select" selector="#catalog_custom_options-head"/>
3133
<element name="CheckIfTabExpandForDateAndTimeCustomOptions" type="button" selector="#catalog_custom_options-head:not(.open)"/>
34+
<element name="expandedTab" type="button" selector="//a[@id='payment_us_banktransfer-head']"/>
35+
<element name="paymentInformation" type="button" selector="//*[contains(text(), 'Shipping Method')]"/>
3236
</section>
3337
</sections>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddProductToCartVerifyThatErrorMessageShouldNotDisappearTest.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
99
<test name="StorefrontAddProductToCartVerifyThatErrorMessageShouldNotDisappearTest">
@@ -21,7 +21,7 @@
2121
<before>
2222
<!-- Set in Stores > Configuration > Catalog > Catalog > Recently Viewed/Compared Products > Synchronize Widget Products With Backend Storage = "Yes" -->
2323
<magentoCLI command="config:set {{EnableSynchronizeWidgetProductsWithBackendStorage.path}} {{EnableSynchronizeWidgetProductsWithBackendStorage.value}}" stepKey="setEnableSynchronizeWidgetProductsWithBackendStorage"/>
24-
<createData entity="_defaultCategory" stepKey="createCategory"/>
24+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
2525
<createData entity="_defaultProduct" stepKey="createSimpleProduct">
2626
<requiredEntity createDataKey="createCategory"/>
2727
</createData>
@@ -44,13 +44,13 @@
4444
<actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductPage">
4545
<argument name="product" value="$$createSimpleProduct$$"/>
4646
</actionGroup>
47-
48-
<fillField selector="{{StorefrontProductInfoMainSection.qty}}" userInput="1001" stepKey="fillQuantity"/>
47+
<clearField selector="{{StorefrontProductInfoMainSection.qty}}" stepKey="clearQuantity"/>
48+
<fillField selector="{{StorefrontProductInfoMainSection.qty}}" userInput="10000" stepKey="fillQuantity"/>
49+
<seeInField userInput="10000" selector="{{StorefrontProductInfoMainSection.qty}}" stepKey="seeUpdatedQuantity"/>
4950

5051
<actionGroup ref="StorefrontProductPageAddSimpleProductToCartActionGroup" stepKey="addProductToCart"/>
5152
<!-- Check that error remains -->
52-
<actionGroup ref="StorefrontAssertProductAddToCartErrorMessageActionGroup" stepKey="assertFailure">
53-
<argument name="message" value="Not enough items for sale"/>
54-
</actionGroup>
53+
<comment userInput="The above step is removed because this isnt a bug . But there happens a Ajax call within few seconds And then error message gets displayed. This cannot be handled in test . Removing above step post testing" stepKey="assertFailure"/>
54+
5555
</test>
5656
</tests>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithInvalidDataTest.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19,6 +19,9 @@
1919
<useCaseId value="MC-38509"/>
2020
<group value="customer"/>
2121
<group value="cloud"/>
22+
<skip>
23+
<issueId value="AC-13608">Skipped</issueId>
24+
</skip>
2225
</annotations>
2326

2427
<actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>

0 commit comments

Comments
 (0)