Merge remote-tracking branch 'origin/MAGETWO-38445' into BUGS

Author: Sergey Semenov

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

@@ -144,7 +144,7 @@ abstract class Grid extends Block
      *
      * @var string
      */
-    protected $rowTemplate = 'td[contains(text(),normalize-space("%s"))]';
+    protected $rowTemplate = 'td[contains(.,normalize-space("%s"))]';
 
     /**
      * Secondary part of row locator template for getRow() method with strict option

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php

@@ -19,7 +19,7 @@ class Configure extends \Magento\Catalog\Test\Block\Adminhtml\Product\Composite\
      *
      * @var string
      */
-    protected $option = '//div[@class="composite-bundle"]//label[.="%option_name%"]//following-sibling::*//%selector%';
+    protected $option = '//fieldset[contains(@class,"composite-bundle")]//label[.="%option_name%"]//following-sibling::*//%selector%';
 
     /**
      * Fill options for the product

dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php

@@ -26,7 +26,7 @@ protected function prepareFilter(FixtureInterface $product)
     {
         $options = $this->prepareOptions($product);
 
-        return ['product_name' => $product->getName(), 'qty_from' => 1, 'qty_to' => 1, 'options' => $options];
+        return ['product_name' => $product->getName(), 'options' => $options];
     }
 
     /**