Merge branches '2.1.13-PR-0.1' and 'MAGETWO-65534' of https://github.com/magento-tango/magento2ce into 2.1.13-PR-0.1

Oleksandr Iegorov · Oleksandr Iegorov · commit 287c7eb1b209 · 2018-02-06T13:44:34.000+02:00
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
@@ -275,6 +275,7 @@ public function searchAndSelect(array $filter)
     {
         $this->search($filter);
         $rowItem = $this->getRow($filter);
+        $this->waitLoader();
         if ($rowItem->isVisible()) {
             $rowItem->find($this->selectItem)->click();
         } else {

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,7 @@ public function searchAndSelect(array $filter)`
`275`	`275`	`{`
`276`	`276`	`$this->search($filter);`
`277`	`277`	`$rowItem = $this->getRow($filter);`
	`278`	`+ $this->waitLoader();`
`278`	`279`	`if ($rowItem->isVisible()) {`
`279`	`280`	`$rowItem->find($this->selectItem)->click();`
`280`	`281`	`} else {`