Skip to content

Commit 2bcb394

Browse files
engcom-Dashengcom-Dash
authored
Merge branch '2.4-develop' into 35358-issue-with-hover-background
2 parents eb798b9 + dc71c49 commit 2bcb394

File tree

136 files changed

+375
-600
lines changed

Some content is hidden

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

136 files changed

+375
-600
lines changed

‎app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml‎

Lines changed: 8 additions & 6 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 2025 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -59,8 +59,10 @@
5959
<see selector="{{CatalogSection.successMessage}}" userInput="Configuration changes will be applied by consumer soon." stepKey="seeCustomSuccessMessage"/>
6060

6161
<!--Trigger the Consumer-->
62-
<magentoCLI stepKey="EnableAsyncConfig" command="queue:consumers:start saveConfigProcessor --max-messages=1"/>
63-
62+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="EnableAsyncConfig">
63+
<argument name="consumerName" value="saveConfigProcessor"/>
64+
<argument name="maxMessages" value="1"/>
65+
</actionGroup>
6466
<!--Open Configuration Page Again-->
6567
<amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPageAgain" />
6668
<waitForPageLoad stepKey="waitForPageLoadAgain"/>

‎app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
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+
*
5+
* ADOBE CONFIDENTIAL
6+
* ___________________
7+
*
8+
* Copyright 2025 Adobe
9+
* All Rights Reserved.
10+
*
11+
* NOTICE: All information contained herein is, and remains
12+
* the property of Adobe and its suppliers, if any. The intellectual
13+
* and technical concepts contained herein are proprietary to Adobe
14+
* and its suppliers and are protected by all applicable intellectual
15+
* property laws, including trade secret and copyright laws.
16+
* Dissemination of this information or reproduction of this material
17+
* is strictly forbidden unless prior written permission is obtained
18+
* from Adobe.
19+
* ************************************************************************
20+
*/
721
-->
822

923
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1024
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1125
<entity name="backendDataOne" type="backend">
1226
<data key="backendConfigName">data</data>
1327
</entity>
28+
<entity name="WebdriverKey">
29+
<data key="tabKey">[\Facebook\WebDriver\WebDriverKeys::TAB]</data>
30+
</entity>
1431
</entities>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
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+
*
5+
* ADOBE CONFIDENTIAL
6+
* ___________________
7+
*
8+
* Copyright 2025 Adobe
9+
* All Rights Reserved.
10+
*
11+
* NOTICE: All information contained herein is, and remains
12+
* the property of Adobe and its suppliers, if any. The intellectual
13+
* and technical concepts contained herein are proprietary to Adobe
14+
* and its suppliers and are protected by all applicable intellectual
15+
* property laws, including trade secret and copyright laws.
16+
* Dissemination of this information or reproduction of this material
17+
* is strictly forbidden unless prior written permission is obtained
18+
* from Adobe.
19+
* ************************************************************************
20+
*/
721
-->
822
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
923
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -16,6 +30,8 @@
1630
<severity value="CRITICAL"/>
1731
<group value="CatalogRule"/>
1832
<group value="mtf_migrated"/>
33+
<!-- pr_exclude is added as in daily builds and will be addressed and group will removed in ACQE-7945-->
34+
<group value="pr_exclude"/>
1935
</annotations>
2036

2137
<before>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/StorefrontAssertSeveralTermsAndConditionsOnPayPalPayFlowProCheckoutReviewPageTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<testCaseId value="AC-4428"/>
1919
<group value="paypalPayflowProWithOutValut"/>
2020
<group value="3rd_party_integration"/>
21-
<!-- <group value="pr_exclude" />-->
21+
<group value="pr_exclude"/>
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>

‎app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php‎

Lines changed: 2 additions & 5 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\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab;
77

@@ -14,7 +14,6 @@
1414
/**
1515
* Adminhtml catalog product downloadable items tab and form
1616
*
17-
* @author Magento Core Team <core@magentocommerce.com>
1817
* @deprecated 100.3.1
1918
* @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
2019
*/
@@ -45,8 +44,6 @@ class Downloadable extends Widget implements TabInterface
4544
protected $blockId = 'downloadableInfo';
4645

4746
/**
48-
* Core registry
49-
*
5047
* @var Registry
5148
*/
5249
protected $_coreRegistry = null;

‎app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
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\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
77

88
/**
99
* Adminhtml catalog product downloadable items tab links section
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1211
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1312
*
1413
* @deprecated 100.3.1 in favor of new class which adds grid links
@@ -36,8 +35,6 @@ class Links extends \Magento\Backend\Block\Template
3635
protected $_template = 'Magento_Downloadable::product/edit/downloadable/links.phtml';
3736

3837
/**
39-
* Downloadable file
40-
*
4138
* @var \Magento\Downloadable\Helper\File
4239
*/
4340
protected $_downloadableFile = null;
@@ -50,8 +47,6 @@ class Links extends \Magento\Backend\Block\Template
5047
protected $_coreFileStorageDb = null;
5148

5249
/**
53-
* Core registry
54-
*
5550
* @var \Magento\Framework\Registry
5651
*/
5752
protected $_coreRegistry;

‎app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
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\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
77

88
/**
99
* Adminhtml catalog product downloadable items tab links section
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
12-
*
1311
* @deprecated 100.3.1 because of new class which adds grids samples
1412
* @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
1513
*/
@@ -28,8 +26,6 @@ class Samples extends \Magento\Backend\Block\Widget
2826
protected $_template = 'Magento_Downloadable::product/edit/downloadable/samples.phtml';
2927

3028
/**
31-
* Downloadable file
32-
*
3329
* @var \Magento\Downloadable\Helper\File
3430
*/
3531
protected $_downloadableFile = null;
@@ -42,8 +38,6 @@ class Samples extends \Magento\Backend\Block\Widget
4238
protected $_coreFileStorageDb = null;
4339

4440
/**
45-
* Core registry
46-
*
4741
* @var \Magento\Framework\Registry
4842
*/
4943
protected $_coreRegistry;

‎app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
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

77
/**
88
* Catalog downloadable product part block
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Downloadable\Block\Catalog\Product\View;
1311

‎app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php‎

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

77
/**
88
* Shopping cart downloadable item render block
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Downloadable\Block\Checkout\Cart\Item;
1311

‎app/code/Magento/Downloadable/Block/Checkout/Success.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
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

77
/**
88
* Downloadable checkout success page
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Downloadable\Block\Checkout;
1311

0 commit comments

Comments
 (0)