MAGETWO-75612: [FT] CreateShipmentEntityTest and CreateInvoiceEntityTest are failed on Jenkins

Author: ameysar

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php

@@ -6,28 +6,29 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Shipments;
 
+use Magento\Ui\Test\Block\Adminhtml\DataGrid;
+
 /**
- * Class Grid
- * Shipments grid on order view page
+ * Shipments grid on order view page.
  */
-class Grid extends \Magento\Backend\Test\Block\Widget\Grid
+class Grid extends DataGrid
 {
     /**
-     * Locator value for link in action column
+     * Locator value for link in action column.
      *
      * @var string
      */
     protected $editLink = '[data-column="real_shipment_id"]';
 
     /**
-     * Locator for shipment ids
+     * Locator for shipment ids.
      *
      * @var string
      */
     protected $shipmentId = 'tbody td:nth-child(2)';
 
     /**
-     * Filters array mapping
+     * Filters array mapping.
      *
      * @var array
      */
@@ -44,12 +45,14 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
     ];
 
     /**
-     * Get shipment ids
+     * Get shipment ids.
      *
      * @return array
      */
     public function getIds()
     {
+        $this->waitLoader();
+        $this->resetFilter();
         $result = [];
         $shipmentIds = $this->_rootElement->getElements($this->shipmentId);
         foreach ($shipmentIds as $shipmentId) {

dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateInvoiceStep.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Sales\Test\TestStep;
 
+use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceNew;
@@ -134,8 +135,11 @@ public function run()
                 $this->data,
                 $this->order->getEntityId()['products']
             );
-            $this->orderInvoiceNew->getFormBlock()->updateQty();
+
             $this->orderInvoiceNew->getFormBlock()->fillFormData($this->data);
+            if ($this->compare($this->order->getEntityId()['products'], $this->data)) {
+                $this->orderInvoiceNew->getFormBlock()->updateQty();
+            }
             if (isset($this->isInvoicePartial)) {
                 $this->orderInvoiceNew->getFormBlock()->submit();
                 $this->salesOrderView->getPageActions()->invoice();
@@ -176,4 +180,31 @@ protected function getShipmentIds()
         $this->salesOrderView->getOrderForm()->openTab('shipments');
         return $this->salesOrderView->getOrderForm()->getTab('shipments')->getGridBlock()->getIds();
     }
+
+    /**
+     * Compare items.
+     *
+     * @param FixtureInterface[] $products
+     * @param array $data
+     * @return bool
+     */
+    private function compare(array $products, array $data)
+    {
+        if (empty($data['items_data'])) {
+            return false;
+        }
+
+        $count = 0;
+        foreach ($data['items_data'] as $key => $item) {
+            if (!isset($products[$key])) {
+                continue;
+            }
+
+            if (is_numeric($item['qty']) && $products[$key]->getData('qty') !== $item['qty']) {
+                ++$count;
+            }
+        }
+
+        return $count !== 0;
+    }
 }

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

@@ -33,10 +33,10 @@ class Grid extends GridInterface
             'selector' => 'input[name="order_increment_id"]',
         ],
         'total_qty_from' => [
-            'selector' => 'input[name="total_qty[from]"',
+            'selector' => 'input[name="total_qty[from]"]',
         ],
         'total_qty_to' => [
-            'selector' => 'input[name="total_qty][to]"',
+            'selector' => 'input[name="total_qty[to]"]',
         ],
     ];
 }

dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php

@@ -39,12 +39,21 @@ public function processAssert(
 
         foreach ($ids['shipmentIds'] as $key => $shipmentId) {
             $filter = [
+                'id' => $shipmentId,
+                'qty' => number_format($totalQty[$key], 4, '.', ''),
+            ];
+            $filterQty = [
                 'id' => $shipmentId,
                 'qty_from' => $totalQty[$key],
                 'qty_to' => $totalQty[$key],
             ];
+            $salesOrderView->getOrderForm()->getTab('shipments')->getGridBlock()->search($filterQty);
             \PHPUnit_Framework_Assert::assertTrue(
-                $salesOrderView->getOrderForm()->getTab('shipments')->getGridBlock()->isRowVisible($filter),
+                $salesOrderView
+                    ->getOrderForm()
+                    ->getTab('shipments')
+                    ->getGridBlock()
+                    ->isRowVisible($filter, false),
                 'Shipment is absent on shipments tab.'
             );
         }