Skip to content

Commit 52ca240

Browse files
sverasvera
authored
Merge pull request #6632 from magento-lynx/merge-from-phpunit9
[2.3-PHP74] Merge from phpunit9
2 parents 9b620b3 + 615902b commit 52ca240

File tree

21 files changed

+156
-60
lines changed

21 files changed

+156
-60
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/AdvanceCatalogSearchBundleProductTest.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
4545
</after>
4646
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
47-
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
48-
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
49-
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
47+
<see userInput="$$product.name$$" stepKey="seeProductName"/>
48+
<see userInput="$$simple1.name$$" stepKey="seeSimple1ProductName"/>
49+
<see userInput="$$simple2.name$$" stepKey="seeSimple2ProductName"/>
5050
</test>
5151
<test name="AdvanceCatalogSearchBundleByNameMysqlTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
5252
<annotations>
@@ -155,9 +155,9 @@
155155
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
156156
</after>
157157
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
158-
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
159-
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
160-
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
158+
<see userInput="$$product.name$$" stepKey="seeProductName"/>
159+
<see userInput="$$simple1.name$$" stepKey="seeSimple1ProductName"/>
160+
<see userInput="$$simple2.name$$" stepKey="seeSimple2ProductName"/>
161161
</test>
162162
<test name="AdvanceCatalogSearchBundleByDescriptionMysqlTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
163163
<annotations>
@@ -316,9 +316,9 @@
316316
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
317317
</after>
318318
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
319-
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
320-
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
321-
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
319+
<see userInput="$$product.name$$" stepKey="seeProductName"/>
320+
<see userInput="$$simple1.name$$" stepKey="seeSimple1ProductName"/>
321+
<see userInput="$$simple2.name$$" stepKey="seeSimple2ProductName"/>
322322
</test>
323323
<test name="AdvanceCatalogSearchBundleByPriceMysqlTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
324324
<annotations>

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

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

104104
<selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="selectOption0Product1"/>
105105
<seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="checkOption0Product1"/>
106106
<fillField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="fillQuantity01"/>
107-
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="checkQuantity01"/>
107+
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="03" stepKey="checkQuantity01"/>
108108

109109
<!--"Radio Buttons" type option-->
110110
<checkOption selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '1')}}" stepKey="selectOption1Product0"/>
111111
<seeCheckboxIsChecked selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '1')}}" stepKey="checkOption1Product0"/>
112112
<fillField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="fillQuantity10"/>
113-
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="checkQuantity10"/>
113+
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="03" stepKey="checkQuantity10"/>
114114

115115
<checkOption selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '2')}}" stepKey="selectOption1Product1"/>
116116
<seeCheckboxIsChecked selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '2')}}" stepKey="checkOption1Product1"/>
117117
<fillField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="fillQuantity11"/>
118-
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="checkQuantity11"/>
118+
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="03" stepKey="checkQuantity11"/>
119119

120120
<!--"Checkbox" type option-->
121121
<!--This option does not support user defined quantities-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@
566566
<description>Validates that the provided Product Tier Price is present and correct.</description>
567567
</annotations>
568568
<arguments>
569-
<argument name="amount" type="string" defaultValue="45"/>
569+
<argument name="amount" type="string" defaultValue="45.00"/>
570570
</arguments>
571571

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionPrice(optionIndex)}}" stepKey="grabOptionPrice"/>
126126
<grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionSku(optionIndex)}}" stepKey="grabOptionSku"/>
127127
<assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionTitle" stepKey="assertOptionTitle"/>
128-
<assertEquals expected="{{option.price}}" expectedType="string" actual="$grabOptionPrice" stepKey="assertOptionPrice"/>
128+
<assertEquals expected="{{option.priceWithDecimals}}" expectedType="string" actual="$grabOptionPrice" stepKey="assertOptionPrice"/>
129129
<assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionSku" stepKey="assertOptionSku"/>
130130
</actionGroup>
131131
<!-- Assumes we are on product edit page -->

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@
965965
<data key="quantity">89</data>
966966
<data key="status">In Stock</data>
967967
<data key="storefrontStatus">IN STOCK</data>
968-
<data key="weight">89.0000</data>
968+
<data key="weight">89</data>
969969
<data key="visibility">Search</data>
970970
<data key="type_id">simple</data>
971971
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
@@ -978,7 +978,7 @@
978978
<data key="quantity">25</data>
979979
<data key="status">Out of Stock</data>
980980
<data key="storefrontStatus">OUT OF STOCK</data>
981-
<data key="weight">125.0000</data>
981+
<data key="weight">125</data>
982982
<data key="type_id">simple</data>
983983
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
984984
</entity>
@@ -990,7 +990,7 @@
990990
<data key="quantity">200</data>
991991
<data key="status">In Stock</data>
992992
<data key="storefrontStatus">IN STOCK</data>
993-
<data key="weight">120.0000</data>
993+
<data key="weight">120</data>
994994
<data key="visibility">Catalog, Search</data>
995995
<data key="type_id">simple</data>
996996
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
@@ -1003,7 +1003,7 @@
10031003
<data key="quantity">125</data>
10041004
<data key="status">In Stock</data>
10051005
<data key="storefrontStatus">IN STOCK</data>
1006-
<data key="weight">25.0000</data>
1006+
<data key="weight">25</data>
10071007
<data key="visibility">Catalog</data>
10081008
<data key="type_id">simple</data>
10091009
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
@@ -1045,7 +1045,7 @@
10451045
<data key="quantity">200</data>
10461046
<data key="status">In Stock</data>
10471047
<data key="storefrontStatus">IN STOCK</data>
1048-
<data key="weight">120.0000</data>
1048+
<data key="weight">120</data>
10491049
<data key="type_id">simple</data>
10501050
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
10511051
</entity>
@@ -1056,7 +1056,7 @@
10561056
<data key="price">74.00</data>
10571057
<data key="quantity">87</data>
10581058
<data key="status">In Stock</data>
1059-
<data key="weight">333.0000</data>
1059+
<data key="weight">333</data>
10601060
<data key="type_id">simple</data>
10611061
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
10621062
</entity>
@@ -1067,7 +1067,7 @@
10671067
<data key="price">325.00</data>
10681068
<data key="quantity">123</data>
10691069
<data key="status">In Stock</data>
1070-
<data key="weight">129.0000</data>
1070+
<data key="weight">129</data>
10711071
<data key="visibility">Not Visible Individually</data>
10721072
<data key="type_id">simple</data>
10731073
<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/CatalogRule/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnCatalogPriceRuleFormActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<grabMultiple selector="{{AdminNewCatalogPriceRule.customerGroupsOptions}}" stepKey="customerGroups"/>
2020
<assertNotContains stepKey="assertCustomerGroupNotInOptions">
21-
<actualResult type="variable">customerGroups</actualResult>
21+
<actualResult type="arrayVariable">customerGroups</actualResult>
2222
<expectedResult type="string">{{customerGroup.code}}</expectedResult>
2323
</assertNotContains>
2424
</actionGroup>

‎app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<item>1</item>
107107
</array>
108108
<data key="simple_action">by_fixed</data>
109-
<data key="discount_amount">10</data>
109+
<data key="discount_amount">10.000000</data>
110110
</entity>
111111

112112
<entity name="CatalogRuleWithoutDiscount" type="catalogRule">

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<!-- Clearing QTY field -->
2323
<doubleClick selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" stepKey="doubleClickOnQtyInput"/>
24-
<pressKey selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" parameterArray="[\WebDriverKeys::DELETE]" stepKey="clearQty"/>
24+
<pressKey selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::DELETE]" stepKey="clearQty"/>
2525
<!-- Clearing QTY field -->
2626

2727
<fillField selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" userInput="{{quote.qty}}" stepKey="changeQty"/>

0 commit comments

Comments
 (0)