Merge pull request magento#3606 from magento-tsg/2.3-develop-pr40

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

Author: Alexander Akimov

app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml

@@ -12,5 +12,6 @@
         <element name="save" type="button" selector="#save" timeout="30"/>
         <element name="saveAndContinue" type="button" selector="button[id*=save_and_continue]" timeout="30"/>
         <element name="delete" type="button" selector="#delete" timeout="30"/>
+        <element name="add" type="button" selector="#add" timeout="30"/>
     </section>
 </sections>

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js

@@ -53,6 +53,8 @@ define([
             if (isConfigurable) {
                 this.disable();
                 this.clear();
+            } else {
+                this.enable();
             }
         }
     });

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php

@@ -9,6 +9,7 @@
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 use Magento\Mtf\Util\Command\Cli\DeployMode;
 use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\User\Test\TestStep\LoginUserOnBackendStep;
 
 /**
  * Verify visibility of form elements on Configuration page.
@@ -53,9 +54,11 @@ public function __inject(
     }
 
     /**
-     * Admin login test after JS minification is turned on in production mode
+     * Admin login test after JS minification is turned on in production mode.
+     *
      * @param DeployMode $cli
      * @param null $configData
+     *
      * @return void
      */
     public function test(
@@ -64,15 +67,26 @@ public function test(
     ) {
         $this->configData = $configData;
 
-       //Pre-conditions
+        //Pre-conditions
         $cli->setDeployModeToDeveloper();
-        $this->objectManager->create(
+        $this->stepFactory->create(
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
             ['configData' => $this->configData]
         )->run();
 
         // Steps
         $cli->setDeployModeToProduction();
-        $this->adminDashboardPage->open();
+        $this->stepFactory->create(LoginUserOnBackendStep::class)->run();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->stepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData]
+        )->cleanup();
     }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php

@@ -10,7 +10,6 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class Search
  * Block for "Search" section
  */
 class Search extends Block
@@ -77,6 +76,7 @@ public function search($keyword, $length = null)
             $keyword = substr($keyword, 0, $length);
         }
         $this->fillSearch($keyword);
+        $this->waitForElementEnabled($this->searchButton);
         $this->_rootElement->find($this->searchButton)->click();
     }
 
@@ -157,4 +157,24 @@ public function clickSuggestedText($text)
         $searchAutocomplete = sprintf($this->searchAutocomplete, $text);
         $this->_rootElement->find($searchAutocomplete, Locator::SELECTOR_XPATH)->click();
     }
+
+    /**
+     * Wait for element is enabled.
+     *
+     * @param string $selector
+     * @param string $strategy
+     * @return bool|null
+     */
+    public function waitForElementEnabled($selector, $strategy = Locator::SELECTOR_CSS)
+    {
+        $browser = $this->browser;
+
+        return $browser->waitUntil(
+            function () use ($browser, $selector, $strategy) {
+                $element = $browser->find($selector, $strategy);
+
+                return !$element->isDisabled() ? true : null;
+            }
+        );
+    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php

@@ -143,5 +143,6 @@ protected function clearDownloadableData()
         /** @var Downloadable $downloadableInfoTab */
         $downloadableInfoTab = $this->catalogProductEdit->getProductForm()->getSection('downloadable_information');
         $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
+        $downloadableInfoTab->setIsDownloadable('No');
     }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml

@@ -11,7 +11,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
             <data name="product" xsi:type="string">configurableProduct::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -21,15 +20,13 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation2">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
             <data name="actionName" xsi:type="string">-</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation3">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="productOrigin" xsi:type="string">configurableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductSimple::product_without_category</data>
             <data name="actionName" xsi:type="string">deleteVariations</data>
@@ -40,12 +37,10 @@
             <data name="productOrigin" xsi:type="string">configurableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
             <data name="actionName" xsi:type="string">deleteVariations</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation5">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
             <data name="product" xsi:type="string">catalogProductSimple::default</data>
             <data name="actionName" xsi:type="string">-</data>
@@ -56,7 +51,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -69,7 +63,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
             <data name="product" xsi:type="string">downloadableProduct::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
@@ -81,15 +74,13 @@
             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductSimple::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation9">
             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
-            <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="actionName" xsi:type="string">clearDownloadableData</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -99,7 +90,6 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation10">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
             <data name="actionName" xsi:type="string">clearDownloadableData</data>
@@ -110,7 +100,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
             <data name="product" xsi:type="string">downloadableProduct::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />

dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml

@@ -9,7 +9,6 @@
     <testCase name="Magento\Ui\Test\TestCase\GridSortingTest" summary="Grid UI Component Sorting" ticketId="MAGETWO-41328">
         <variation name="SalesOrderGridSorting">
             <data name="tag" xsi:type="string">severity:S2</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="description" xsi:type="string">Verify sales order grid storting</data>
             <data name="steps" xsi:type="array">
                 <item name="0" xsi:type="string">-</item>

dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php

@@ -28,6 +28,13 @@ class PromoQuoteForm extends FormSections
      */
     protected $waitForSelectorVisible = false;
 
+    /**
+     * Selector of name element on the form.
+     *
+     * @var string
+     */
+    private $nameElementSelector = 'input[name=name]';
+
     /**
      * Fill form with sections.
      *
@@ -38,6 +45,8 @@ class PromoQuoteForm extends FormSections
      */
     public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
     {
+        $this->waitForElementNotVisible($this->waitForSelector);
+        $this->waitForElementVisible($this->nameElementSelector);
         $sections = $this->getFixtureFieldsByContainers($fixture);
         if ($replace) {
             $sections = $this->prepareData($sections, $replace);

dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php

@@ -181,7 +181,7 @@ public function resetFilter()
      *
      * @return void
      */
-    protected function waitFilterToLoad()
+    public function waitFilterToLoad()
     {
         $this->getTemplateBlock()->waitLoader();
         $browser = $this->_rootElement;

dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php

@@ -89,6 +89,7 @@ public function test(
         $page->open();
         /** @var DataGrid $gridBlock */
         $gridBlock = $page->$gridRetriever();
+        $gridBlock->waitFilterToLoad();
         $gridBlock->resetFilter();
 
         $sortingResults = [];