Merge remote-tracking branch 'origin/MAGETWO-75612' into 2.1-develop-pr31

Author: DianaRusin

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,13 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
     ];
 
     /**
-     * Get shipment ids
+     * Get shipment ids.
      *
      * @return array
      */
     public function getIds()
     {
+        $this->waitLoader();
         $result = [];
         $shipmentIds = $this->_rootElement->getElements($this->shipmentId);
         foreach ($shipmentIds as $shipmentId) {

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.'
             );
         }