Skip to content

Commit 47dfa9f

Browse files
deepak-soni1deepak-soni1
authored
Merge branch 'magento-commerce:2.4-develop' into graphql-api-enhancements
2 parents 47da0c5 + e044f74 commit 47dfa9f

File tree

200 files changed

+13647
-2109
lines changed

Some content is hidden

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

200 files changed

+13647
-2109
lines changed

‎app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleRegularPriceTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function testGetAmount()
9898
->willReturn($expectedResult);
9999

100100
$this->priceCurrencyMock->expects($this->once())
101-
->method('convertAndRound')
101+
->method('convert')
102102
->willReturnArgument(0);
103103

104104
$result = $this->regularPrice->getAmount();
@@ -123,7 +123,7 @@ public function testGetMaximalPrice()
123123
->willReturn($expectedResult);
124124

125125
$this->priceCurrencyMock->expects($this->once())
126-
->method('convertAndRound')
126+
->method('convert')
127127
->willReturnArgument(0);
128128

129129
$result = $this->regularPrice->getMaximalPrice();
@@ -165,7 +165,7 @@ public function testGetMaximalPriceForFixedPriceBundleWithOption()
165165
->willReturn($expectedPrice);
166166

167167
$this->priceCurrencyMock->expects($this->once())
168-
->method('convertAndRound')
168+
->method('convert')
169169
->willReturnArgument(0);
170170

171171
$result = $this->regularPrice->getMaximalPrice();
@@ -185,7 +185,7 @@ public function testGetMinimalPrice()
185185
->willReturn($expectedResult);
186186

187187
$this->priceCurrencyMock->expects($this->once())
188-
->method('convertAndRound')
188+
->method('convert')
189189
->willReturnArgument(0);
190190

191191
$this->bundleCalculatorMock->expects($this->once())
@@ -226,7 +226,7 @@ public function testGetMinimalPriceForFixedPricedBundleWithOptions()
226226
->willReturn($minOptionPrice);
227227

228228
$this->priceCurrencyMock->expects($this->once())
229-
->method('convertAndRound')
229+
->method('convert')
230230
->willReturnArgument(0);
231231

232232
$this->bundleCalculatorMock->expects($this->once())

‎app/code/Magento/Catalog/Pricing/Price/RegularPrice.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
1111

1212
/**
13-
* Class RegularPrice
13+
* Regular Price model
1414
*/
1515
class RegularPrice extends AbstractPrice implements BasePriceProviderInterface
1616
{
1717
/**
1818
* Price type
1919
*/
20-
const PRICE_CODE = 'regular_price';
20+
public const PRICE_CODE = 'regular_price';
2121

2222
/**
2323
* Get price value
@@ -28,7 +28,7 @@ public function getValue()
2828
{
2929
if ($this->value === null) {
3030
$price = $this->product->getPrice();
31-
$priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
31+
$priceInCurrentCurrency = $this->priceCurrency->convert($price);
3232
$this->value = $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : 0;
3333
}
3434
return $this->value;

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssertCustomOptionBasedOnPositionActionGroup.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<actionGroups
10+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
12+
<actionGroup name="AdminAssertCustomOptionBasedOnPositionActionGroup">
13+
<annotations>
14+
<description>Assert custom options order based on position</description>
15+
</annotations>
16+
<arguments>
17+
<argument name="positionNumber" type="string"/>
18+
<argument name="title" type="string"/>
19+
</arguments>
20+
<waitForPageLoad stepKey="waitForCustomOptionsToLoad"/>
21+
<scrollTo selector="{{AdminProductCustomizableOptionsSection.customOptionOrder(positionNumber)}}" x="0" y="-80" stepKey="scrollToOptionTitle"/>
22+
<waitForText selector="{{AdminProductCustomizableOptionsSection.customOptionOrder(positionNumber)}}" userInput="{{title}}" stepKey="seeOptionTitleBasedOnOrder"/>
23+
</actionGroup>
24+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminEditFieldTitleCustomOptionsActionGroup.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<actionGroups
10+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
12+
<actionGroup name="AdminEditFieldTitleCustomOptionsActionGroup">
13+
<annotations>
14+
<description>Edit field custom options title</description>
15+
</annotations>
16+
<arguments>
17+
<argument name="optionNumber" type="string"/>
18+
<argument name="optionInputFieldNumber" type="string"/>
19+
<argument name="title" type="string"/>
20+
</arguments>
21+
<waitForPageLoad stepKey="waitForCustomOptionsLoad"/>
22+
<scrollTo selector="{{AdminProductCustomizableOptionsSection.useDefaultValue(optionNumber)}}" x="0" y="-80" stepKey="scrollToUseDefaultOptionValue"/>
23+
<waitForElementClickable selector="{{AdminProductCustomizableOptionsSection.useDefaultValue(optionNumber)}}" stepKey="waitForUseDefaultOption"/>
24+
<uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultValue(optionNumber)}}" stepKey="uncheckDefaultOptionTitle"/>
25+
<fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput(optionInputFieldNumber)}}" userInput="{{title}}" stepKey="fillOptionTitle"/>
26+
</actionGroup>
27+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInRecentlyOrderedWidgetActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
</arguments>
1818

1919
<waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" stepKey="waitWidgetRecentlyOrderedProductsGrid"/>
20-
<see selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyOrderedWidget"/>
20+
<waitForText selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyOrderedWidget"/>
2121
</actionGroup>
2222
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInRecentlyViewedWidgetActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</arguments>
1919

2020
<waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" stepKey="waitWidgetRecentlyViewedProductsGrid"/>
21-
<see selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyViewedWidget"/>
21+
<waitForText selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyViewedWidget"/>
2222
</actionGroup>
2323
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection/AdminProductCustomizableOptionsSection.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,13 @@
7070
<!-- Elements to test drag&drop -->
7171
<element name="dragCustomOptionRecord" type="block" selector="(//tr[{{dragIndex}}]//div[contains(@class, 'draggable-handle')])['1']" timeout="30" parameterized="true"/>
7272
<element name="customOptionRecordTitle" type="button" selector="//table[@data-index='options']//tr[{{index}}]//div[contains(@class, 'admin__collapsible-title')]//span" timeout="30" parameterized="true"/>
73+
74+
<element name="useDefaultValue" type="checkbox" selector="(//input[@data-form-part='product_form'])[{{index}}]" parameterized="true"/>
75+
<element name="customOptionOrder" type="text" selector="(//div[@class='admin__collapsible-title']/span)[{{index}}]" parameterized="true"/>
76+
<element name="paginationNextButton" type="button" selector="//div[@data-bind='visible: !!element.getRecordCount()']//button[@class='action-next']"/>
77+
<element name="customOptionPageDropdown" type="select" selector="//div[@class='admin__control-table-pagination']/div[@class='selectmenu']"/>
78+
<element name="customPageOption" type="text" selector="//div[@class='selectmenu _active']//li[@data-bind='css: {_edit: isCustomVisible()}']"/>
79+
<element name="customPageNumber" type="input" selector="//div[@class='selectmenu _active']//input[@class='admin__control-text']"/>
80+
<element name="customSave" type="button" selector="//div[@class='selectmenu _active']//div[@class='selectmenu-item-edit']/button"/>
7381
</section>
7482
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<element name="productPriceLinkAfterLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]/following::span[contains(text(), '{{var2}}')]" parameterized="true"/>
3232
<element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocart')]" parameterized="true"/>
3333
<!--<element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>-->
34-
<element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
34+
<element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{var1}}')]]//*[(name()='a' or name()='button') and contains(@class, 'tocompare')]" parameterized="true"/>
3535
<element name="ProductImageByNameAndSrc" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[contains(@src, '{{src}}')]" parameterized="true"/>
3636
<element name="ProductStockUnavailable" type="text" selector="//*[text()='Out of stock']"/>
3737
<element name="listedProductOnProductPage" type="block" selector="//div[contains(@aria-labelledBy,'{{attribute_code}}')]//div[@aria-label='{{attribute_name}}']" parameterized="true"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<element name="asLowAsLabel" type="input" selector="//strong[@id='block-related-heading']/following::span[@class='price-label'][1]"/>
3737
<element name="asLowAsLabelAgain" type="input" selector="//strong[@id='block-related-heading']/following::span[@class='price-label'][2]"/>
3838
<element name="specialPriceValue" type="text" selector="//span[@class='special-price']//span[@class='price']"/>
39-
<element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]"/>
39+
<element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]//span"/>
4040
<element name="clickForPriceLink" type="text" selector="//div[@class='price-box price-final_price']//a[contains(text(), 'Click for price')]"/>
4141
<element name="addReviewLink" type="text" selector="//div[@class='reviews-actions']//a[@class='action add']"/>
4242
<element name="fptPrice" type="text" selector=".//*[@class='weee']/span"/>

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

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
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="AdminImportCustomOptionsBetweenProductsTest">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<stories value="Import customizable options between products "/>
15+
<title value="Import customizable options from Product A to Product B and verify order "/>
16+
<description value="This test case verifies whether customizable options in simple product displaying in order while importing from other product."/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="AC-6349"/>
19+
<group value="catalog"/>
20+
</annotations>
21+
<before>
22+
<!-- Pre-condition 2: Create two products -->
23+
<createData entity="_defaultProduct" stepKey="productA"/>
24+
<createData entity="_defaultProduct" stepKey="productB"/>
25+
<!-- Step 1: Login as admin -->
26+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
27+
<!-- Pre-condition 1: Create store view -->
28+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFrenchStoreView">
29+
<argument name="customStore" value="customStoreFR"/>
30+
</actionGroup>
31+
</before>
32+
<after>
33+
<!-- Delete products, store view -->
34+
<deleteData createDataKey="productA" stepKey="deleteProductA"/>
35+
<deleteData createDataKey="productB" stepKey="deleteProductB"/>
36+
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteFrenchStoreView">
37+
<argument name="customStore" value="customStoreFR"/>
38+
</actionGroup>
39+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
40+
</after>
41+
<!-- Step 2: Edit product A -->
42+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEdit">
43+
<argument name="productId" value="$$productA.id$$"/>
44+
</actionGroup>
45+
<!-- Step 3: Expand Customizable options -->
46+
<scrollTo selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="scrollToCustomizableOptionsA"/>
47+
<waitForElementClickable selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="waitForCustomizableOptionsA"/>
48+
<click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomizableOptionsA"/>
49+
<!-- Step 4,5: Click on Add options button and Add options -->
50+
<actionGroup ref="AdminAddProductCustomOptionActionGroup" stepKey="addProductCustomFieldOption1">
51+
<argument name="customOptionTitle" value="Option1"/>
52+
<argument name="customOptionType" value="Field"/>
53+
</actionGroup>
54+
<actionGroup ref="AdminAddProductCustomOptionActionGroup" stepKey="addProductCustomFieldOption2">
55+
<argument name="customOptionTitle" value="Option2"/>
56+
<argument name="customOptionType" value="Field"/>
57+
</actionGroup>
58+
<actionGroup ref="AdminAddProductCustomOptionActionGroup" stepKey="addProductCustomFieldOption3">
59+
<argument name="customOptionTitle" value="Option3"/>
60+
<argument name="customOptionType" value="Field"/>
61+
</actionGroup>
62+
<actionGroup ref="AdminAddProductCustomOptionActionGroup" stepKey="addProductCustomFieldOption4">
63+
<argument name="customOptionTitle" value="Option4"/>
64+
<argument name="customOptionType" value="Field"/>
65+
</actionGroup>
66+
<scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
67+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProductA"/>
68+
<!-- Step 6: Change the store view, and in customization option change the title -->
69+
<waitForElementClickable selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="waitForStoreSwitch"/>
70+
<click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher"/>
71+
<waitForElementClickable selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="waitForFrenchStore"/>
72+
<click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="selectFrenchStoreView"/>
73+
<waitForElementClickable selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForAcceptStoreSwitch"/>
74+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitch"/>
75+
<waitForPageLoad stepKey="waitForFrenchStoreView"/>
76+
<scrollTo selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="scrollToCustomOptions"/>
77+
<waitForElementClickable selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="waitForCustomizableOptions"/>
78+
<click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomizableOptions"/>
79+
<actionGroup ref="AdminEditFieldTitleCustomOptionsActionGroup" stepKey="editOption1">
80+
<argument name="optionNumber" value="1"/>
81+
<argument name="optionInputFieldNumber" value="0"/>
82+
<argument name="title" value="Option1FR"/>
83+
</actionGroup>
84+
<actionGroup ref="AdminEditFieldTitleCustomOptionsActionGroup" stepKey="editOption2">
85+
<argument name="optionNumber" value="2"/>
86+
<argument name="optionInputFieldNumber" value="1"/>
87+
<argument name="title" value="Option2FR"/>
88+
</actionGroup>
89+
<actionGroup ref="AdminEditFieldTitleCustomOptionsActionGroup" stepKey="editOption3">
90+
<argument name="optionNumber" value="3"/>
91+
<argument name="optionInputFieldNumber" value="2"/>
92+
<argument name="title" value="Option3FR"/>
93+
</actionGroup>
94+
<actionGroup ref="AdminEditFieldTitleCustomOptionsActionGroup" stepKey="editOption4">
95+
<argument name="optionNumber" value="4"/>
96+
<argument name="optionInputFieldNumber" value="3"/>
97+
<argument name="title" value="Option4FR"/>
98+
</actionGroup>
99+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProductAFR"/>
100+
<!--Step 7,8,9: Edit product B and import options from product A -->
101+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
102+
<argument name="productId" value="$$productB.id$$"/>
103+
</actionGroup>
104+
<waitForElementClickable selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="waitForCustomizableOptionsForProductB"/>
105+
<click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomizableOptionsForProductB"/>
106+
<actionGroup ref="ImportProductCustomizableOptionsActionGroup" stepKey="importOptions">
107+
<argument name="productName" value="$$productA.name$$"/>
108+
</actionGroup>
109+
<!--Step 10: Save product B-->
110+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProductB"/>
111+
<!-- Navigate to custom options and set pagination display-->
112+
<scrollTo selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="scrollToTheCustomOptions"/>
113+
<waitForElementClickable selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="waitForTheCustomizableOptions"/>
114+
<click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openTheCustomizableOptions"/>
115+
<actionGroup ref="AdminOpenAndApplyCustomOptionRecordsPerPageActionGroup" stepKey="setCustomPageSize">
116+
<argument name="perPageInputValue" value="2"/>
117+
</actionGroup>
118+
<!-- Step 11: Verify options in product B are in correct order and have correct titles -->
119+
<actionGroup ref="AdminAssertCustomOptionBasedOnPositionActionGroup" stepKey="seeOption1Title">
120+
<argument name="positionNumber" value="1"/>
121+
<argument name="title" value="Option1"/>
122+
</actionGroup>
123+
<actionGroup ref="AdminAssertCustomOptionBasedOnPositionActionGroup" stepKey="seeOption2Title">
124+
<argument name="positionNumber" value="2"/>
125+
<argument name="title" value="Option2"/>
126+
</actionGroup>
127+
<!-- Click on custom options pagination next button-->
128+
<scrollTo selector="{{AdminProductCustomizableOptionsSection.paginationNextButton}}" x="0" y="-80" stepKey="scrollToPagination"/>
129+
<waitForElementClickable selector="{{AdminProductCustomizableOptionsSection.paginationNextButton}}" stepKey="waitForPaginationToBecomeActive"/>
130+
<click selector="{{AdminProductCustomizableOptionsSection.paginationNextButton}}" stepKey="clickNextButton"/>
131+
<waitForPageLoad stepKey="waitForPaginationToLoad"/>
132+
<actionGroup ref="AdminAssertCustomOptionBasedOnPositionActionGroup" stepKey="seeOption3Title">
133+
<argument name="positionNumber" value="1"/>
134+
<argument name="title" value="Option3"/>
135+
</actionGroup>
136+
<actionGroup ref="AdminAssertCustomOptionBasedOnPositionActionGroup" stepKey="seeOption4Title">
137+
<argument name="positionNumber" value="2"/>
138+
<argument name="title" value="Option4"/>
139+
</actionGroup>
140+
</test>
141+
</tests>

0 commit comments

Comments
 (0)