Merge pull request #3673 from magento-tsg/2.3-develop-pr41

[TSG] Upporting for 2.3 (pr41) (2.3.1)

Author: Alexander Akimov

dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php

@@ -20,6 +20,13 @@ class Grid extends DataGrid
      */
     protected $addProducts = '.action-primary[data-role="action"]';
 
+    /**
+     * Grid selector.
+     *
+     * @var string
+     */
+    private $gridSelector = '[data-role="grid-wrapper"]';
+
     /**
      * Filters array mapping
      *
@@ -40,4 +47,59 @@ public function addProducts()
     {
         $this->_rootElement->find($this->addProducts)->click();
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function searchAndSelect(array $filter)
+    {
+        $this->waitGridVisible();
+        $this->waitLoader();
+        parent::searchAndSelect($filter);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function waitLoader()
+    {
+        parent::waitLoader();
+        $this->waitGridLoaderInvisible();
+    }
+
+    /**
+     * Wait for grid to appear.
+     *
+     * @return void
+     */
+    private function waitGridVisible()
+    {
+        $browser = $this->_rootElement;
+        $selector = $this->gridSelector;
+
+        return $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isVisible() ? true : null;
+            }
+        );
+    }
+
+    /**
+     * Wait for grid spinner disappear.
+     *
+     * @return void
+     */
+    private function waitGridLoaderInvisible()
+    {
+        $browser = $this->_rootElement;
+        $selector = $this->loader;
+
+        return $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isVisible() === false ? true : null;
+            }
+        );
+    }
 }

dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\GroupedProduct\Test\TestCase\CreateGroupedProductEntityTest" summary="Create Grouped Product" ticketId="MAGETWO-24877">
         <variation name="CreateGroupedProductEntityTestVariation1" summary="Create Grouped Product and Assign It to the Category" ticketId="MAGETWO-13610">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
             <data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>

dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\TestFramework\TestCase;
 
-use Magento\Framework\App\Request\Http as HttpRequest;
-
 /**
  * A parent class for backend controllers - contains directives for admin user creation and authentication.
  *
@@ -122,7 +120,7 @@ public function testAclHasAccess()
      */
     public function testAclNoAccess()
     {
-        if ($this->resource === null) {
+        if ($this->resource === null || $this->uri === null) {
             $this->markTestIncomplete('Acl test is not complete');
         }
         if ($this->httpMethod) {

dev/tests/integration/testsuite/Magento/BundleImportExport/Model/BundleTest.php

@@ -9,7 +9,10 @@
 
 class BundleTest extends AbstractProductExportImportTestCase
 {
-    public function exportImportDataProvider()
+    /**
+     * @return array
+     */
+    public function exportImportDataProvider(): array
     {
         return [
             // @todo uncomment after MAGETWO-49677 resolved
@@ -45,17 +48,13 @@ public function exportImportDataProvider()
         ];
     }
 
-    public function importReplaceDataProvider()
-    {
-        return $this->exportImportDataProvider();
-    }
-
     /**
-     * @param \Magento\Catalog\Model\Product $expectedProduct
-     * @param \Magento\Catalog\Model\Product $actualProduct
+     * @inheritdoc
      */
-    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
-    {
+    protected function assertEqualsSpecificAttributes(
+        \Magento\Catalog\Model\Product $expectedProduct,
+        \Magento\Catalog\Model\Product $actualProduct
+    ): void {
         $expectedBundleProductOptions = $expectedProduct->getExtensionAttributes()->getBundleProductOptions();
         $actualBundleProductOptions = $actualProduct->getExtensionAttributes()->getBundleProductOptions();