MTA-2395: Tax module functional tests maintenance

- fixed random fails on bamboo

Author: Vitaliy Honcharenko

dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php

@@ -213,18 +213,20 @@ protected function addNewTaxClass(array $taxClasses, SimpleElement $element)
             $option = $element->find(sprintf($this->optionMaskElement, $taxClass), Locator::SELECTOR_XPATH);
             if (!$option->isVisible()) {
                 $element->waitUntil(
-                    function () use ($element) {
-                        if ($element->find($this->addNewInput)->isVisible()) {
+                    function () use ($element, $taxClass) {
+                        $input = $element->find($this->addNewInput);
+                        if ($input->isVisible()) {
+                            $input->click();
+                            $input->setValue($taxClass);
+                            $element->find($this->saveButton)->click();
+                            $this->waitUntilOptionIsVisible($element, $taxClass);
                             return true;
                         } else {
                             $this->clickAddNewButton($element);
                             return null;
                         }
                     }
                 );
-                $element->find($this->addNewInput)->keys([$taxClass]);
-                $element->find($this->saveButton)->click();
-                $this->waitUntilOptionIsVisible($element, $taxClass);
             }
         }
     }

dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.xml

@@ -9,7 +9,7 @@
     <testCase name="Magento\Tax\Test\TestCase\TaxCalculationTest">
         <variation name="TaxCalculationTestVariation1">
             <data name="description" xsi:type="string">Simple product tier price with sales rule, customer tax equals store tax and catalog price including tax</data>
-            <data name="configData" xsi:type="string">row_cat_incl_ship_excl_after_disc_on_excl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, row_cat_incl_ship_excl_after_disc_on_excl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
@@ -38,7 +38,7 @@
         </variation>
         <variation name="TaxCalculationTestVariation2">
             <data name="description" xsi:type="string">Simple product group price with sales rule, customer tax greater than store tax and catalog price excluding tax</data>
-            <data name="configData" xsi:type="string">row_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, row_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::simple_with_group_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
@@ -67,7 +67,7 @@
         </variation>
         <variation name="TaxCalculationTestVariation3">
             <data name="description" xsi:type="string">Simple product group price with sales rule, customer tax less than store tax and catalog price excluding tax</data>
-            <data name="configData" xsi:type="string">total_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::simple_with_group_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
@@ -96,7 +96,7 @@
         </variation>
         <variation name="TaxCalculationTestVariation4">
             <data name="description" xsi:type="string">Simple product special price with sales rule, customer tax less than store tax and catalog price including tax</data>
-            <data name="configData" xsi:type="string">row_cat_incl_ship_excl_before_disc_on_incl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, row_cat_incl_ship_excl_before_disc_on_incl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::product_with_special_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
@@ -125,7 +125,7 @@
         </variation>
         <variation name="TaxCalculationTestVariation5">
             <data name="description" xsi:type="string">Simple product tier price with sales rule, customer tax less than store tax and catalog price including tax</data>
-            <data name="configData" xsi:type="string">unit_cat_incl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, unit_cat_incl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
@@ -154,7 +154,7 @@
         </variation>
         <variation name="TaxCalculationTestVariation6">
             <data name="description" xsi:type="string">Simple product special price with sales rule, customer tax equals store tax and catalog price excluding tax</data>
-            <data name="configData" xsi:type="string">total_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::product_with_special_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
@@ -183,7 +183,7 @@
         </variation>
         <variation name="TaxCalculationTestVariation7">
             <data name="description" xsi:type="string">Simple product group price with sales rule, customer tax equals store tax and catalog price excluding tax</data>
-            <data name="configData" xsi:type="string">unit_cat_excl_ship_excl_after_disc_on_excl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, unit_cat_excl_ship_excl_after_disc_on_excl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::simple_with_group_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
@@ -212,7 +212,7 @@
         </variation>
         <variation name="TaxCalculationTestVariation8">
             <data name="description" xsi:type="string">Simple product special price with sales rule, customer tax greater than store tax and catalog price including tax</data>
-            <data name="configData" xsi:type="string">total_cat_incl_ship_excl_before_disc_on_excl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_incl_ship_excl_before_disc_on_excl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::simple_with_group_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
@@ -241,7 +241,7 @@
         </variation>
         <variation name="TaxCalculationTestVariation9">
             <data name="description" xsi:type="string">Simple product tier price with sales rule, customer tax greater than store tax and catalog price excluding tax</data>
-            <data name="configData" xsi:type="string">total_cat_excl_ship_incl_after_disc_on_incl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_after_disc_on_incl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>
@@ -270,7 +270,7 @@
         </variation>
         <variation name="TaxCalculationTestVariation10">
             <data name="description" xsi:type="string">Simple product special price with sales rule, customer tax greater than store tax and catalog price excluding tax</data>
-            <data name="configData" xsi:type="string">unit_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
+            <data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, unit_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
             <data name="product" xsi:type="string">catalogProductSimple::product_with_special_price_and_category</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
             <data name="catalogRule" xsi:type="string">-</data>