MC-20070: Fix Skipped MFTF Tests From MC-17140: MAGETWO-95175, MAGETWO-97001, MAGETWO-98189

Author: svitja

app/code/Magento/Config/Test/Mftf/Data/GenerateCategoryProductUrlRewritesData.xml renamed to app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/GenerateCategoryProductUrlRewriteData.xml

@@ -12,6 +12,5 @@
         <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary" timeout="60"/>
         <element name="openNewCreditMemoFromInvoice" type="button" selector=".action-default.scalable.credit-memo"/>
         <element name="submitNewRefundFromInvoice" type="button" selector=".action-default.scalable.save.submit-button refund primary"/>
-        <element name="submitShipment" type="button" selector=".action-default.scalable.save.submit-button.primary" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Config/Test/Mftf/Data/DefaultProductTaxClassData.xml

@@ -18,6 +18,6 @@
         <element name="shipmentId" type="input" selector="//div[@id='sales_order_view_tabs_order_shipments_content']//input[@name='increment_id']" timeout="30"/>
         <element name="totalQtyFrom" type="input" selector="[name='total_qty[from]']" timeout="30"/>
         <element name="totalQtyTo" type="input" selector="[name='total_qty[to]']" timeout="30"/>
-        <element name="viewShipment" type="button" selector="#sales_order_view_tabs_order_shipments_content div.admin__data-grid-wrap a.action-menu-item"/>
+        <element name="viewShipment" type="button" selector="#sales_order_view_tabs_order_shipments_content div.admin__data-grid-wrap a.action-menu-item" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartToCreateShipmentActionGroup.xml

@@ -22,8 +22,8 @@
         <fillField selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{taxRuleCode}}" stepKey="fillRuleName"/>
         <click selector="{{AdminTaxRulesSection.selectTaxRate(taxRateCode)}}" stepKey="selectTaxRate"/>
         <click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
-        <click selector="{{AdminTaxRulesSection.selectTaxClass(taxableGoodsTaxClass.class_name)}}" stepKey="unSelectTaxClass"/>
-        <click selector="{{AdminTaxRulesSection.selectTaxClass(productTaxClassName)}}" stepKey="selectProductTaxClass"/>
+        <click selector="{{AdminTaxRulesSection.selectProductTaxClass(taxableGoodsTaxClass.class_name)}}" stepKey="unSelectTaxClass"/>
+        <click selector="{{AdminTaxRulesSection.selectProductTaxClass(productTaxClassName)}}" stepKey="selectProductTaxClass"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
         <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the tax rule." stepKey="verifyRuleSaved"/>

app/code/Magento/Sales/Test/Mftf/Page/AdminOrderNewShipmentPage.xml

@@ -57,4 +57,10 @@
     <entity name="EmptyField" type="taxPostCodeEmpty">
         <data key="value"/>
     </entity>
+    <entity name="DefaultProductTaxClass">
+        <!-- Default value -->
+        <data key="path">tax/classes/default_product_tax_class</data>
+        <data key="label">Yes</data>
+        <data key="value">2</data>
+    </entity>
 </entities>

app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml

@@ -35,6 +35,6 @@
         <element name="taxRateMultiSelectItems" type="block" selector=".mselect-list-item"/>
         <element name="taxRateNumber" type="button" selector="//div[@data-ui-id='tax-rate-form-fieldset-element-form-field-tax-rate']//div[@class='mselect-items-wrapper']//label[{{var}}]" parameterized="true"/>
         <element name="selectTaxRate" type="input" selector="//span[text()='{{taxCode}}']" parameterized="true"/>
-        <element name="selectTaxClass" type="input" selector="//div[contains(@class, 'field-tax_product_class')]//*[contains(@class, 'mselect-list-item') and contains(.,'{{taxClass}}')]" parameterized="true"/>
+        <element name="selectProductTaxClass" type="input" selector="//div[contains(@class, 'field-tax_product_class')]//*[contains(@class, 'mselect-list-item') and contains(.,'{{taxClass}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml

@@ -56,7 +56,7 @@
                 <argument name="product" value="$$createSimpleProduct$$"/>
             </actionGroup>
             <waitForPageLoad stepKey="waitForPageLoad2"/>
-            <selectOption selector="{{AdminProductFormActionSection.selectTaxClass}}" userInput="NewTaxClass" stepKey="SetNewTaxClass" />
+            <selectOption selector="{{AdminProductFormActionSection.selectProductTaxClass}}" userInput="NewTaxClass" stepKey="SetNewTaxClass" />
             <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
             <!--Set configs-->
             <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToTaxConfigPage"/>