Skip to content

Commit 6870525

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/2.4-develop-php74' into 2.4-develop-php74-pr38
2 parents f11f63d + f9ded1d commit 6870525

File tree

77 files changed

+2090
-438
lines changed

Some content is hidden

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

77 files changed

+2090
-438
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<seeOptionIsSelected selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="seeCorrectTaxClass"/>
6767

6868
<!--Fill out price-->
69-
<seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="10" stepKey="seePrice"/>
69+
<seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="10.00" stepKey="seePrice"/>
7070

7171
<!--Stock status-->
7272
<seeOptionIsSelected selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="In Stock" stepKey="seeStockStatus"/>
@@ -165,7 +165,7 @@
165165
<seeOptionIsSelected selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="seeCorrectTaxClass2"/>
166166

167167
<!--Price-->
168-
<seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="20" stepKey="seePrice2"/>
168+
<seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="20.00" stepKey="seePrice2"/>
169169

170170
<!--Stock status-->
171171
<seeOptionIsSelected selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="Out of Stock" stepKey="seeStockStatus2"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPricesTest.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,45 +65,45 @@
6565
<selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct1"/>
6666
<seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct1"/>
6767
<grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="DropDownTierPriceTextProduct1"/>
68-
<assertContains stepKey="assertDropDownTierPriceTextProduct1">
68+
<assertStringContainsString stepKey="assertDropDownTierPriceTextProduct1">
6969
<expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
7070
<actualResult type="variable">DropDownTierPriceTextProduct1</actualResult>
71-
</assertContains>
71+
</assertStringContainsString>
7272
<!-- Check Tier Prices for product 2 -->
7373
<selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct2"/>
7474
<seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct2"/>
7575
<grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="dropDownTierPriceTextProduct2"/>
76-
<assertContains stepKey="assertDropDownTierPriceTextProduct2">
76+
<assertStringContainsString stepKey="assertDropDownTierPriceTextProduct2">
7777
<expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
7878
<actualResult type="variable">dropDownTierPriceTextProduct2</actualResult>
79-
</assertContains>
79+
</assertStringContainsString>
8080

8181
<!--"Radio Buttons" type option-->
8282
<!-- Check Tier Prices for product 1 -->
8383
<grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct1"/>
84-
<assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct1">
84+
<assertStringContainsString stepKey="assertRadioButtonsOptionTierPriceTextProduct1">
8585
<expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
8686
<actualResult type="variable">radioButtonsOptionTierPriceTextProduct1</actualResult>
87-
</assertContains>
87+
</assertStringContainsString>
8888
<!-- Check Tier Prices for product 2 -->
8989
<grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct2"/>
90-
<assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct2">
90+
<assertStringContainsString stepKey="assertRadioButtonsOptionTierPriceTextProduct2">
9191
<expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
9292
<actualResult type="variable">radioButtonsOptionTierPriceTextProduct2</actualResult>
93-
</assertContains>
93+
</assertStringContainsString>
9494

9595
<!--"Checkbox" type option-->
9696
<!-- Check Tier Prices for product 1 -->
9797
<grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct1"/>
98-
<assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct1">
98+
<assertStringContainsString stepKey="assertCheckBoxOptionTierPriceTextProduct1">
9999
<expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
100100
<actualResult type="variable">checkBoxOptionTierPriceTextProduct1</actualResult>
101-
</assertContains>
101+
</assertStringContainsString>
102102
<!-- Check Tier Prices for product 2 -->
103103
<grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct2"/>
104-
<assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct2">
104+
<assertStringContainsString stepKey="assertCheckBoxOptionTierPriceTextProduct2">
105105
<expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
106106
<actualResult type="variable">checkBoxOptionTierPriceTextProduct2</actualResult>
107-
</assertContains>
107+
</assertStringContainsString>
108108
</test>
109109
</tests>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,23 @@
105105
<selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="selectOption0Product0"/>
106106
<seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="checkOption0Product0"/>
107107
<fillField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="fillQuantity00"/>
108-
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="checkQuantity00"/>
108+
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="03" stepKey="checkQuantity00"/>
109109

110110
<selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="selectOption0Product1"/>
111111
<seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="checkOption0Product1"/>
112112
<fillField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="fillQuantity01"/>
113-
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="checkQuantity01"/>
113+
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="03" stepKey="checkQuantity01"/>
114114

115115
<!--"Radio Buttons" type option-->
116116
<checkOption selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '1')}}" stepKey="selectOption1Product0"/>
117117
<seeCheckboxIsChecked selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '1')}}" stepKey="checkOption1Product0"/>
118118
<fillField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="fillQuantity10"/>
119-
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="checkQuantity10"/>
119+
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="03" stepKey="checkQuantity10"/>
120120

121121
<checkOption selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '2')}}" stepKey="selectOption1Product1"/>
122122
<seeCheckboxIsChecked selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '2')}}" stepKey="checkOption1Product1"/>
123123
<fillField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="fillQuantity11"/>
124-
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="checkQuantity11"/>
124+
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="03" stepKey="checkQuantity11"/>
125125

126126
<!--"Checkbox" type option-->
127127
<!--This option does not support user defined quantities-->

‎app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaFormsDisplayingTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<waitForPageLoad stepKey="WaitForPageLoaded"/>
2626
<!--Verify fields removed-->
2727
<grabTextFrom selector="{{CaptchaFormsDisplayingSection.forms}}" stepKey="formItems"/>
28-
<assertNotContains stepKey="checkoutAsGuest">
28+
<assertStringNotContainsString stepKey="checkoutAsGuest">
2929
<expectedResult type="string">{{CaptchaData.checkoutAsGuest}}</expectedResult>
3030
<actualResult type="variable">$formItems</actualResult>
31-
</assertNotContains>
32-
<assertNotContains stepKey="register">
31+
</assertStringNotContainsString>
32+
<assertStringNotContainsString stepKey="register">
3333
<expectedResult type="string">{{CaptchaData.register}}</expectedResult>
3434
<actualResult type="variable">$formItems</actualResult>
35-
</assertNotContains>
35+
</assertStringNotContainsString>
3636
<!--Verify fields existence-->
3737
<grabTextFrom selector="{{CaptchaFormsDisplayingSection.createUser}}" stepKey="createUser"/>
3838
<assertEquals stepKey="CreateUserFieldIsPresent">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>Validates that the provided Product Tier Price is present and correct.</description>
1414
</annotations>
1515
<arguments>
16-
<argument name="amount" type="string" defaultValue="45"/>
16+
<argument name="amount" type="string" defaultValue="45.00"/>
1717
</arguments>
1818

1919
<click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<argument name="productPosition" type="string"/>
1818
</arguments>
1919
<grabTextFrom selector="{{StoreFrontRecentlyViewedProductSection.ProductName(productPosition)}}" stepKey="grabRelatedProductPosition"/>
20-
<assertContains stepKey="assertRelatedProductName">
20+
<assertStringContainsString stepKey="assertRelatedProductName">
2121
<actualResult type="const">$grabRelatedProductPosition</actualResult>
2222
<expectedResult type="const">{{productName}}</expectedResult>
23-
</assertContains>
23+
</assertStringContainsString>
2424
</actionGroup>
25-
</actionGroups>
25+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</assertEquals>
2727
<assertEquals stepKey="assertOptionPrice">
2828
<actualResult type="const">$grabOptionPrice</actualResult>
29-
<expectedResult type="string">{{option.price}}</expectedResult>
29+
<expectedResult type="string">{{option.priceWithDecimals}}</expectedResult>
3030
</assertEquals>
3131
<assertEquals stepKey="assertOptionSku">
3232
<actualResult type="const">$grabOptionSku</actualResult>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@
977977
<data key="quantity">89</data>
978978
<data key="status">In Stock</data>
979979
<data key="storefrontStatus">IN STOCK</data>
980-
<data key="weight">89.0000</data>
980+
<data key="weight">89</data>
981981
<data key="visibility">Search</data>
982982
<data key="type_id">simple</data>
983983
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
@@ -990,7 +990,7 @@
990990
<data key="quantity">25</data>
991991
<data key="status">Out of Stock</data>
992992
<data key="storefrontStatus">OUT OF STOCK</data>
993-
<data key="weight">125.0000</data>
993+
<data key="weight">125</data>
994994
<data key="type_id">simple</data>
995995
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
996996
</entity>
@@ -1002,7 +1002,7 @@
10021002
<data key="quantity">200</data>
10031003
<data key="status">In Stock</data>
10041004
<data key="storefrontStatus">IN STOCK</data>
1005-
<data key="weight">120.0000</data>
1005+
<data key="weight">120</data>
10061006
<data key="visibility">Catalog, Search</data>
10071007
<data key="type_id">simple</data>
10081008
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
@@ -1015,7 +1015,7 @@
10151015
<data key="quantity">125</data>
10161016
<data key="status">In Stock</data>
10171017
<data key="storefrontStatus">IN STOCK</data>
1018-
<data key="weight">25.0000</data>
1018+
<data key="weight">25</data>
10191019
<data key="visibility">Catalog</data>
10201020
<data key="type_id">simple</data>
10211021
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
@@ -1057,7 +1057,7 @@
10571057
<data key="quantity">200</data>
10581058
<data key="status">In Stock</data>
10591059
<data key="storefrontStatus">IN STOCK</data>
1060-
<data key="weight">120.0000</data>
1060+
<data key="weight">120</data>
10611061
<data key="type_id">simple</data>
10621062
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
10631063
</entity>
@@ -1068,7 +1068,7 @@
10681068
<data key="price">74.00</data>
10691069
<data key="quantity">87</data>
10701070
<data key="status">In Stock</data>
1071-
<data key="weight">333.0000</data>
1071+
<data key="weight">333</data>
10721072
<data key="type_id">simple</data>
10731073
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
10741074
</entity>
@@ -1080,6 +1080,7 @@
10801080
<data key="quantity">123</data>
10811081
<data key="status">In Stock</data>
10821082
<data key="weight">129.0000</data>
1083+
<data key="weightNoDecimals">129</data>
10831084
<data key="visibility">Not Visible Individually</data>
10841085
<data key="type_id">simple</data>
10851086
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<data key="is_require">true</data>
1717
<data key="sort_order">1</data>
1818
<data key="price">10</data>
19+
<data key="priceWithDecimals">10.000000</data>
1920
<data key="price_type">fixed</data>
2021
<data key="max_characters">0</data>
2122
</entity>
@@ -27,6 +28,7 @@
2728
<data key="is_require">true</data>
2829
<data key="sort_order">1</data>
2930
<data key="price">20</data>
31+
<data key="priceWithDecimals">20.000000</data>
3032
<data key="price_type">fixed</data>
3133
<data key="max_characters">0</data>
3234
</entity>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@
4343
<actionGroup ref="AdminFormSaveAndDuplicateActionGroup" stepKey="saveAndDuplicateProductFormFirstTime"/>
4444
<conditionalClick selector="{{AdminProductSEOSection.sectionHeader}}" dependentSelector="{{AdminProductSEOSection.urlKeyInput}}" visible="false" stepKey="openSEOSection"/>
4545
<grabValueFrom selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="grabDuplicatedProductUrlKey"/>
46-
<assertContains stepKey="assertDuplicatedProductUrlKey">
46+
<assertStringContainsString stepKey="assertDuplicatedProductUrlKey">
4747
<actualResult type="const">$grabDuplicatedProductUrlKey</actualResult>
4848
<expectedResult type="const">$$createSimpleProduct.custom_attributes[url_key]$$</expectedResult>
49-
</assertContains>
50-
<assertContains stepKey="assertDuplicatedProductUrlKey1">
49+
</assertStringContainsString>
50+
<assertStringContainsString stepKey="assertDuplicatedProductUrlKey1">
5151
<actualResult type="const">$grabDuplicatedProductUrlKey</actualResult>
5252
<expectedResult type="string">-1</expectedResult>
53-
</assertContains>
53+
</assertStringContainsString>
5454
<!--Add duplicated product to the simple product-->
5555
<comment userInput="Add duplicated product to the simple product" stepKey="commentAddProduct"/>
5656
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToSimpleProductPage">
@@ -81,14 +81,14 @@
8181
<conditionalClick selector="{{AdminProductSEOSection.sectionHeader}}" dependentSelector="{{AdminProductSEOSection.urlKeyInput}}" visible="false" stepKey="openProductSEOSection"/>
8282
<waitForElementVisible selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="waitForUrlKeyField"/>
8383
<grabValueFrom selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="grabSecondDuplicatedProductUrlKey"/>
84-
<assertContains stepKey="assertSecondDuplicatedProductUrlKey">
84+
<assertStringContainsString stepKey="assertSecondDuplicatedProductUrlKey">
8585
<actualResult type="const">$grabSecondDuplicatedProductUrlKey</actualResult>
8686
<expectedResult type="const">$$createSimpleProduct.custom_attributes[url_key]$$</expectedResult>
87-
</assertContains>
88-
<assertContains stepKey="assertSecondDuplicatedProductUrlKey1">
87+
</assertStringContainsString>
88+
<assertStringContainsString stepKey="assertSecondDuplicatedProductUrlKey1">
8989
<actualResult type="const">$grabSecondDuplicatedProductUrlKey</actualResult>
9090
<expectedResult type="string">-2</expectedResult>
91-
</assertContains>
91+
</assertStringContainsString>
9292
<conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.sectionHeader}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" visible="false" stepKey="openProductRUSSection1"/>
9393
<waitForElementVisible selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedProductSku('related')}}" stepKey="waitForSelectedProductSku"/>
9494
<see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedProductSku('related')}}" userInput="$$createSimpleProduct.sku$$-1" stepKey="seeRelatedProductForDuplicated"/>

0 commit comments

Comments
 (0)