Skip to content

Commit 5bfed2e

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into ACQE-functional-deployment-v6
2 parents bd5f43c + 6bdad31 commit 5bfed2e

File tree

163 files changed

+746
-784
lines changed

Some content is hidden

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

163 files changed

+746
-784
lines changed

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddUpdateDeleteWidgetOfTypeCatalogProductLinkTypeTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<description value="Admin should be able to create widget type of Catalog product link and shown on storefront"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-12209"/>
19-
<skip>
20-
<issueId value="ACQE-4481"/>
21-
</skip>
2219
</annotations>
2320

2421
<before>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSpecialPriceOnConfigurableProductWithTextSwatchAttributeTest.xml

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
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="StorefrontSpecialPriceOnConfigurableProductWithTextSwatchAttributeTest">
12+
<annotations>
13+
<features value="ConfigurableProduct"/>
14+
<stories value="Special Price on configurable product"/>
15+
<title value="Special Price on Configurable Product with Swatch Attribute"/>
16+
<description value="Verify special price on configurable product created with text swatch attribute"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="AC-4047"/>
19+
<group value="ConfigurableProduct"/>
20+
</annotations>
21+
<before>
22+
<!-- Precondition step1: create a category-->
23+
<createData entity="_defaultCategory" stepKey="category1"/>
24+
<!-- Precondition step2: create configurable product-->
25+
<createData entity="BaseConfigurableProduct" stepKey="createConfigurableProduct">
26+
<field key="name">Configurable product p1</field>
27+
<requiredEntity createDataKey="category1"/>
28+
</createData>
29+
<!-- Precondition step3: login to backend -->
30+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
31+
</before>
32+
<after>
33+
<!-- Delete created configurable product -->
34+
<deleteData createDataKey="category1" stepKey="deleteCategory"/>
35+
<actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteCreatedProducts"/>
36+
<!-- Delete color attribute -->
37+
<actionGroup ref="DeleteProductAttributeActionGroup" stepKey="deleteColorAttribute">
38+
<argument name="ProductAttribute" value="ProductColorAttribute"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
41+
</after>
42+
<!-- step1: Enable swatches -->
43+
<actionGroup ref="AddTextSwatchToProductActionGroup" stepKey="addColorAttribute">
44+
<argument name="attributeName" value="{{ProductColorAttribute.frontend_label}}"/>
45+
<argument name="attributeCode" value="{{ProductColorAttribute.attribute_code}}"/>
46+
<argument name="option1" value="Black"/>
47+
<argument name="option2" value="White"/>
48+
<argument name="option3" value="Blue"/>
49+
</actionGroup>
50+
<!-- Open configurable product and create configurations -->
51+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openProduct">
52+
<argument name="productId" value="$createConfigurableProduct.id$"/>
53+
</actionGroup>
54+
<actionGroup ref="GenerateConfigurationsByAttributeCodeActionGroup" stepKey="createProductConfigurations">
55+
<argument name="attributeCode" value="{{ProductColorAttribute.attribute_code}}"/>
56+
</actionGroup>
57+
<actionGroup ref="ChangeConfigurableProductChildProductPriceActionGroup" stepKey="changePriceForBlack">
58+
<argument name="productAttributes" value="Color: Black"/>
59+
<argument name="productPrice" value="100"/>
60+
</actionGroup>
61+
<actionGroup ref="ChangeConfigurableProductChildProductPriceActionGroup" stepKey="changePriceForWhite">
62+
<argument name="productAttributes" value="Color: White"/>
63+
<argument name="productPrice" value="200"/>
64+
</actionGroup>
65+
<actionGroup ref="SaveConfigurableProductAddToCurrentAttributeSetActionGroup" stepKey="saveConfigurableProduct"/>
66+
<!-- step2: Add special price to simple configurable-Black product generated by configurable -->
67+
<actionGroup ref="FilterAndSelectProductActionGroup" stepKey="seeConfigurableProduct1BlackProductInGrid">
68+
<argument name="productSku" value="$createConfigurableProduct.sku$-Black"/>
69+
</actionGroup>
70+
<actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="addSpecialPriceToBlackProduct">
71+
<argument name="price" value="90"/>
72+
</actionGroup>
73+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveBlackProductForm"/>
74+
<!-- step2: Add special price to simple configurable-White product generated by configurable -->
75+
<actionGroup ref="FilterAndSelectProductActionGroup" stepKey="seeConfigurableProduct1WhiteProductInGrid">
76+
<argument name="productSku" value="$createConfigurableProduct.sku$-White"/>
77+
</actionGroup>
78+
<actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="addSpecialPriceToWhiteProduct">
79+
<argument name="price" value="190"/>
80+
</actionGroup>
81+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveWhiteProductForm"/>
82+
<!-- remove the Filter From the product page-->
83+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
84+
<actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearFilterFromProductIndex"/>
85+
<!-- step3: Go to category page -->
86+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openStorefrontCategoryPage">
87+
<argument name="categoryName" value="$category1.name$"/>
88+
</actionGroup>
89+
<!-- step4: Select configurable product (with special price) -->
90+
<actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="selectConfigurableProductP1">
91+
<argument name="product" value="$createConfigurableProduct$"/>
92+
</actionGroup>
93+
<actionGroup ref="AssertStorefrontProductDetailPageFinalPriceActionGroup" stepKey="assertProductFinalPriceTextForP1">
94+
<argument name="finalProductPrice" value="90.00"/>
95+
</actionGroup>
96+
<!-- step5: Select configurable attribute assigned to that product (Eg:Size or color) -->
97+
<actionGroup ref="StorefrontSelectSwatchOptionOnProductPageActionGroup" stepKey="selectBlackOptionOnP1">
98+
<argument name="optionName" value="Black"/>
99+
</actionGroup>
100+
<!-- step6: Check how price changes -->
101+
<actionGroup ref="AssertStorefrontProductDetailPageFinalPriceActionGroup" stepKey="assertProductFinalPriceTextForBlackP1">
102+
<argument name="finalProductPrice" value="90.00"/>
103+
</actionGroup>
104+
<!-- step5: Select configurable attribute assigned to that product (Eg:Size or color) -->
105+
<actionGroup ref="StorefrontSelectSwatchOptionOnProductPageActionGroup" stepKey="selectWhiteOptionOnP1">
106+
<argument name="optionName" value="White"/>
107+
</actionGroup>
108+
<!-- step6: Check how price changes -->
109+
<actionGroup ref="AssertStorefrontProductDetailPageFinalPriceActionGroup" stepKey="assertProductFinalPriceTextForWhiteP1">
110+
<argument name="finalProductPrice" value="190.00"/>
111+
</actionGroup>
112+
</test>
113+
</tests>

‎app/code/Magento/Multishipping/Block/Checkout/Shipping.php

Lines changed: 2 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
declare(strict_types=1);
77

@@ -15,7 +15,6 @@
1515
* Mustishipping checkout shipping
1616
*
1717
* @api
18-
* @author Magento Core Team <core@magentocommerce.com>
1918
* @since 100.0.2
2019
*/
2120
class Shipping extends \Magento\Sales\Block\Items\AbstractItems

‎app/code/Magento/Multishipping/Block/Checkout/State.php

Lines changed: 4 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
* Multishipping checkout state
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Multishipping\Block\Checkout;
1311

@@ -33,6 +31,8 @@ public function __construct(
3331
}
3432

3533
/**
34+
* Retrieve available checkout steps
35+
*
3636
* @return array
3737
*/
3838
public function getSteps()

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

Lines changed: 8 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
* Multishipping checkout success information
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Multishipping\Block\Checkout;
1311

@@ -32,6 +30,8 @@ public function __construct(
3230
}
3331

3432
/**
33+
* Get Order Ids
34+
*
3535
* @return array|bool|string
3636
*/
3737
public function getOrderIds()
@@ -44,6 +44,8 @@ public function getOrderIds()
4444
}
4545

4646
/**
47+
* Get order Url
48+
*
4749
* @param int $orderId
4850
* @return string
4951
*/
@@ -53,6 +55,8 @@ public function getViewOrderUrl($orderId)
5355
}
5456

5557
/**
58+
* Get continue Url
59+
*
5660
* @return string
5761
*/
5862
public function getContinueUrl()

‎app/code/Magento/Multishipping/Helper/Url.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
* Multi Shipping urls helper
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Multishipping\Helper;
1311

‎app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php

Lines changed: 18 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 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
77

@@ -11,21 +11,21 @@
1111
/**
1212
* Multishipping checkout state model
1313
*
14-
* @author Magento Core Team <core@magentocommerce.com>
14+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
1515
*/
1616
class State extends \Magento\Framework\DataObject
1717
{
18-
const STEP_SELECT_ADDRESSES = 'multishipping_addresses';
18+
public const STEP_SELECT_ADDRESSES = 'multishipping_addresses';
1919

20-
const STEP_SHIPPING = 'multishipping_shipping';
20+
public const STEP_SHIPPING = 'multishipping_shipping';
2121

22-
const STEP_BILLING = 'multishipping_billing';
22+
public const STEP_BILLING = 'multishipping_billing';
2323

24-
const STEP_OVERVIEW = 'multishipping_overview';
24+
public const STEP_OVERVIEW = 'multishipping_overview';
2525

26-
const STEP_SUCCESS = 'multishipping_success';
26+
public const STEP_SUCCESS = 'multishipping_success';
2727

28-
const STEP_RESULTS = 'multishipping_results';
28+
public const STEP_RESULTS = 'multishipping_results';
2929

3030
/**
3131
* Allow steps array
@@ -107,6 +107,8 @@ public function getActiveStep()
107107
}
108108

109109
/**
110+
* Setup Checkout step
111+
*
110112
* @param string $step
111113
* @return $this
112114
*/
@@ -171,34 +173,41 @@ public function unsCompleteStep($step)
171173
return $this;
172174
}
173175

176+
// phpcs:disable
174177
/**
178+
*
175179
* @return bool
176180
*/
177181
public function canSelectAddresses()
178182
{
183+
return false;
179184
}
180185

181186
/**
182187
* @return bool
183188
*/
184189
public function canInputShipping()
185190
{
191+
return false;
186192
}
187193

188194
/**
189195
* @return bool
190196
*/
191197
public function canSeeOverview()
192198
{
199+
return false;
193200
}
194201

195202
/**
196203
* @return bool
197204
*/
198205
public function canSuccess()
199206
{
207+
return false;
200208
}
201209

210+
// phpcs:enable
202211
/**
203212
* Retrieve checkout session
204213
*

‎app/code/Magento/Newsletter/Block/Adminhtml/Problem.php

Lines changed: 2 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\Newsletter\Block\Adminhtml;
77

@@ -11,7 +11,6 @@
1111
* Newsletter problem block template.
1212
*
1313
* @api
14-
* @author Magento Core Team <core@magentocommerce.com>
1514
* @since 100.0.2
1615
*/
1716
class Problem extends \Magento\Backend\Block\Template

‎app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.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
* Newsletter subscribers grid filter checkbox
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Newsletter\Block\Adminhtml\Problem\Grid\Filter;
1311

‎app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.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
* Newsletter subscribers grid checkbox item renderer
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Newsletter\Block\Adminhtml\Problem\Grid\Renderer;
1311

‎app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php

Lines changed: 2 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 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Newsletter\Block\Adminhtml\Queue\Edit;
@@ -10,8 +10,6 @@
1010

1111
/**
1212
* Newsletter queue edit form
13-
*
14-
* @author Magento Core Team <core@magentocommerce.com>
1513
*/
1614
class Form extends \Magento\Backend\Block\Widget\Form\Generic
1715
{

0 commit comments

Comments
 (0)