Skip to content

Commit 7a5ad34

Browse files
tomreecetomreece
committed
MQE-2076: [PHPUnit 9] assertEquals and assertNotEquals optional parameters removed
1 parent d3afbff commit 7a5ad34

10 files changed

+25
-24
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/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/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/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/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductNotVisibleIndividually.price}}" stepKey="seeSimpleProductPrice"/>
8787
<seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductNotVisibleIndividually.quantity}}" stepKey="seeSimpleProductQuantity"/>
8888
<seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductNotVisibleIndividually.status}}" stepKey="seeSimpleProductStockStatus"/>
89-
<seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductNotVisibleIndividually.weight}}" stepKey="seeSimpleProductWeight"/>
89+
<seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductNotVisibleIndividually.weightNoDecimals}}" stepKey="seeSimpleProductWeight"/>
9090
<click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
9191
<see selector="{{AdminProductFormSection.selectMultipleCategories}}" userInput="$$categoryEntity.name$$" stepKey="seeSelectedCategories" />
9292
<seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductNotVisibleIndividually.visibility}}" stepKey="seeSimpleProductVisibility"/>

‎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/Tax/Test/Mftf/Data/TaxRateData.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<data key="zip_is_range">1</data>
5959
<data key="zip_from">90001</data>
6060
<data key="zip_to">96162</data>
61-
<data key="rate">15.05</data>
61+
<data key="rate">15.0500</data>
6262
</entity>
6363
<entity name="TaxRateWithFixedZipUtah" type="taxRate">
6464
<data key="code" unique="suffix">Tax Rate </data>
@@ -76,7 +76,7 @@
7676
<data key="tax_country">United Kingdom</data>
7777
<data key="tax_postcode">*</data>
7878
<data key="zip_is_range">0</data>
79-
<data key="rate">777</data>
79+
<data key="rate">777.0000</data>
8080
</entity>
8181
<entity name="taxRateCustomRateCanada" type="taxRate">
8282
<data key="code" unique="suffix">TaxRate</data>
@@ -85,7 +85,7 @@
8585
<data key="tax_region_id">*</data>
8686
<data key="tax_postcode">180</data>
8787
<data key="zip_is_range">0</data>
88-
<data key="rate">25</data>
88+
<data key="rate">25.0000</data>
8989
</entity>
9090
<entity name="taxRateCustomRateUK" type="taxRate">
9191
<data key="code" unique="suffix">TaxRate</data>
@@ -94,7 +94,7 @@
9494
<data key="zip_is_range">1</data>
9595
<data key="zip_from">1</data>
9696
<data key="zip_to">7800935</data>
97-
<data key="rate">12.99</data>
97+
<data key="rate">12.9900</data>
9898
</entity>
9999
<entity name="taxRateCustomRateFrance" type="taxRate">
100100
<data key="code" unique="suffix">TaxRate</data>
@@ -104,7 +104,7 @@
104104
<data key="tax_region">Val-d'Oise</data>
105105
<data key="tax_postcode">*</data>
106106
<data key="zip_is_range">0</data>
107-
<data key="rate">0.1</data>
107+
<data key="rate">0.1000</data>
108108
</entity>
109109
<entity name="taxRateForPensylvannia" extends="defaultTaxRate">
110110
<data key="tax_region_id">51</data>

‎app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@
6666
<seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeRuleName2"/>
6767
<seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="seeZipCode"/>
6868
<seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="Australia" stepKey="seeCountry2"/>
69-
<seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="20" stepKey="seeRate"/>
69+
<seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="20.0000" stepKey="seeRate"/>
7070

7171
<!-- Go to the tax rule grid page and verify our tax rate can be used in the rule -->
7272
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
7373
<waitForPageLoad stepKey="waitForTaxRuleIndex"/>
7474
<click selector="{{AdminGridMainControls.add}}" stepKey="clickAddNewTaxRule"/>
7575
<see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
7676
</test>
77-
</tests>
77+
</tests>

‎app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="*" stepKey="seeZipCode"/>
5858
<seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="France" stepKey="seeCountry2"/>
5959
<seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="Val-d'Oise" stepKey="seeState"/>
60-
<seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="999" stepKey="seeRate"/>
60+
<seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="999.0000" stepKey="seeRate"/>
6161

6262
<!-- Verify we see expected values on the tax rule form page -->
6363
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>

‎app/code/Magento/Weee/Test/Mftf/Test/AdminFixedTaxValSavedForSpecificWebsiteTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,6 @@
118118
<seeElement selector="{{AdminProductAddFPTValueSection.setWebSiteForFPTOption($$createProductFPTAttribute.attribute_code$$, NewWebSiteData.name)}}" stepKey="checkSecondWebsitesInDropDownSecondTime"/>
119119
<!-- Check if created tax attribute is saved -->
120120
<comment userInput="Check if created tax attribute is saved" stepKey="checkTaxAttributeIsSaved"/>
121-
<seeInField selector="{{AdminProductAddFPTValueSection.setTaxValueForFPT($$createProductFPTAttribute.attribute_code$$)}}" userInput="10" stepKey="checkTaxAttributeSaved"/>
121+
<seeInField selector="{{AdminProductAddFPTValueSection.setTaxValueForFPT($$createProductFPTAttribute.attribute_code$$)}}" userInput="10.0000" stepKey="checkTaxAttributeSaved"/>
122122
</test>
123123
</tests>

0 commit comments

Comments
 (0)