MTA-2723: Functional test maintenance. Part 2

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php

@@ -302,7 +302,6 @@ public function resetFilter()
     {
         $this->waitLoader();
         $this->_rootElement->find($this->resetButton)->click();
-        $this->waitForElementVisible($this->loader);
         $this->waitLoader();
     }
 

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/CustomerGrid.php

@@ -39,10 +39,10 @@ class CustomerGrid extends DataGrid
             'input' => 'select',
         ],
         'entity_id_from' => [
-            'selector' => '[name="filters[entity_id][from]"]',
+            'selector' => '[name="entity_id[from]"]',
         ],
         'entity_id_to' => [
-            'selector' => '[name="filters[entity_id][to]"]',
+            'selector' => '[name="entity_id[to]"]',
         ],
     ];
 }

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/CreditMemo/Grid.php

@@ -25,16 +25,16 @@ class Grid extends \Magento\Ui\Test\Block\Adminhtml\DataGrid
      */
     protected $filters = [
         'id' => [
-            'selector' => 'input[name="filters[increment_id]"]',
+            'selector' => 'input[name="increment_id"]',
         ],
         'order_id' => [
-            'selector' => 'input[name="filters[order_increment_id]"]',
+            'selector' => 'input[name="order_increment_id"]',
         ],
         'grand_total_from' => [
-            'selector' => 'input[name="filters[base_grand_total][from]"]',
+            'selector' => 'input[name="base_grand_total[from]"]',
         ],
         'grand_total_to' => [
-            'selector' => 'input[name="filters[base_grand_total][to]"]',
+            'selector' => 'input[name="base_grand_total[to]"]',
         ],
     ];
 }

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Invoice/Grid.php

@@ -18,16 +18,16 @@ class Grid extends \Magento\Ui\Test\Block\Adminhtml\DataGrid
      */
     protected $filters = [
         'id' => [
-            'selector' => 'input[name="filters[increment_id]"]',
+            'selector' => 'input[name="increment_id"]',
         ],
         'order_id' => [
-            'selector' => 'input[name="filters[order_increment_id]"]',
+            'selector' => 'input[name="order_increment_id"]',
         ],
         'grand_total_from' => [
-            'selector' => 'input[name="filters[grand_total][from]"]',
+            'selector' => 'input[name="grand_total[from]"]',
         ],
         'grand_total_to' => [
-            'selector' => 'input[name="filters[grand_total][to]"]',
+            'selector' => 'input[name="grand_total[to]"]',
         ],
     ];
 

dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Webapi.php

@@ -31,6 +31,7 @@ class Webapi extends AbstractWebapi implements OrderInjectableInterface
         ],
         'country_id' => [
             'United States' => 'US',
+            'United Kingdom' => 'GB',
         ],
     ];
 

dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Shipment/Grid.php

@@ -27,16 +27,16 @@ class Grid extends GridInterface
      */
     protected $filters = [
         'id' => [
-            'selector' => 'input[name="filters[increment_id]"]',
+            'selector' => 'input[name="increment_id"]',
         ],
         'order_id' => [
-            'selector' => 'input[name="filters[order_increment_id]"]',
+            'selector' => 'input[name="order_increment_id"]',
         ],
         'total_qty_from' => [
-            'selector' => 'input[name="filters[total_qty][from]"]',
+            'selector' => 'input[name="total_qty[from]"',
         ],
         'total_qty_to' => [
-            'selector' => 'input[name="filters[total_qty][to]"]',
+            'selector' => 'input[name="total_qty][to]"',
         ],
     ];
 }

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

@@ -19,7 +19,7 @@
             <data name="customerGroup" xsi:type="string">valid_intra_union_group</data>
             <data name="cart/data/subtotal" xsi:type="string">10</data>
             <data name="cart/data/tax_amount" xsi:type="string">2</data>
-            <data name="cart/data/grand_total" xsi:type="string">12</data>
+            <data name="cart/data/grand_total" xsi:type="string">17</data>
             <data name="prices" xsi:type="array">
                 <item name="grandTotal" xsi:type="string">17</item>
             </data>

dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php

@@ -307,8 +307,9 @@ protected function selectItems(array $items)
     /**
      * Sort grid by field.
      *
-     * @param $field
+     * @param string $field
      * @param string $sort
+     * @return void
      */
     public function sortGridByField($field, $sort = "desc")
     {