Skip to content

Commit 5abbd35

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into AC-13257
2 parents f033404 + 6bdad31 commit 5abbd35

File tree

3 files changed

+118
-8
lines changed

3 files changed

+118
-8
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/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml

Lines changed: 5 additions & 5 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 2018 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -12,7 +12,7 @@
1212
<element name="itemProductName" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
1313
<element name="itemProductSku" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-sku-block" parameterized="true"/>
1414
<element name="itemStatus" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-status" parameterized="true"/>
15-
<element name="itemOriginalPrice" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-original-price .price" parameterized="true"/>
15+
<element name="itemOriginalPrice" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-price-original .price" parameterized="true"/>
1616
<element name="itemPrice" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-price .price" parameterized="true"/>
1717
<element name="itemQty" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-ordered-qty .qty-table" parameterized="true"/>
1818
<element name="itemSubtotal" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-subtotal .price" parameterized="true"/>

0 commit comments

Comments
 (0)