MC-31444: [FT] [MFTF] [2.4] Fix flaky test StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest (MC-41933)

Author: zakdma

app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml

@@ -16,7 +16,7 @@
             <description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
             <severity value="CRITICAL"/>
             <useCaseId value="MC-294"/>
-            <testCaseId value="MC-16526"/>
+            <testCaseId value="MC-28586"/>
             <group value="checkout"/>
             <group value="tax"/>
             <group value="weee"/>
@@ -36,10 +36,8 @@
             <!--  Store>Configuration; Sales>Tax FPT Enable -->
             <createData entity="WeeeConfigEnable" stepKey="enableFPT"/>
             <!--  Simple product is created  Price = 10;  FPT United States/California/10,United States/New York/20 -->
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
                 <field key="price">10.00</field>
-                <requiredEntity createDataKey="createCategory"/>
             </createData>
             <!-- Customer is created with default addresses: -->
             <createData entity="Simple_US_Customer_CA" stepKey="createCustomer"/>
@@ -71,7 +69,6 @@
             <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
             <createData entity="WeeeConfigDisable" stepKey="disableFPT"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductsGridFilters"/>

app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml

@@ -16,7 +16,7 @@
             <description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
             <severity value="CRITICAL"/>
             <useCaseId value="MC-294"/>
-            <testCaseId value="MC-16525"/>
+            <testCaseId value="MC-28585"/>
             <group value="checkout"/>
             <group value="tax"/>
             <group value="weee"/>

app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml

@@ -16,7 +16,7 @@
             <description value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
             <severity value="CRITICAL"/>
             <useCaseId value="MC-294"/>
-            <testCaseId value="MC-16538"/>
+            <testCaseId value="MC-28592"/>
             <group value="checkout"/>
             <group value="tax"/>
             <group value="weee"/>
@@ -36,10 +36,8 @@
             <!--  Store>Configuration; Sales>Tax FPT Enable -->
             <createData entity="WeeeConfigEnable" stepKey="enableFPT"/>
             <!--  Simple product is created  Price = 10;  FPT United States/California/10,United States/New York/20 -->
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
                 <field key="price">10.00</field>
-                <requiredEntity createDataKey="createCategory"/>
             </createData>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <actionGroup ref="GoToProductPageViaIDActionGroup" stepKey="openProductEditPage">
@@ -66,7 +64,6 @@
             <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
             <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
             <createData entity="WeeeConfigDisable" stepKey="disableFPT"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
             <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductsGridFilters"/>

app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml

@@ -16,7 +16,7 @@
             <description value="Tax information are updating/recalculating on fly in shopping cart for Guest (virtual quote)"/>
             <severity value="CRITICAL"/>
             <useCaseId value="MC-294"/>
-            <testCaseId value="MC-11946"/>
+            <testCaseId value="MC-26557"/>
             <group value="checkout"/>
             <group value="tax"/>
             <group value="weee"/>