Merge branch '2.2-develop' into 2.2.4-PR-20170111

Author: Dmytro Voskoboinikov

dev/tests/functional/composer.json

@@ -4,8 +4,9 @@
     },
     "require": {
         "php": "7.0.2|~7.0.6|~7.1.0",
+        "magento/mtf": "1.0.0-rc59",
         "allure-framework/allure-phpunit": "~1.2.0",
-        "magento/mtf": "1.0.0-rc58",
+        "doctrine/annotations": "1.4.*",
         "phpunit/phpunit": "~4.8.0|~5.5.0",
         "phpunit/phpunit-selenium": ">=1.2"
     },

dev/tests/functional/etc/config.xml.dist

@@ -27,6 +27,11 @@
         <baseUrl>http://magento2ce.com/</baseUrl>
         <backendName>backend</backendName>
     </install>
+   <server>
+        <item name="selenium">
+            <item name="resolution" width="1366" height="768" />
+        </item>
+    </server>
     <handler>
         <webapi priority="0">
             <token>integration_token</token>

dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php

@@ -65,6 +65,7 @@ public function setValue($value)
     {
         $date = $this->parseDate($value);
         $date[1] = ltrim($date[1], '0');
+        $this->click();
         $this->find($this->datePickerButton, Locator::SELECTOR_XPATH)->click();
         $datapicker = $this->find($this->datePickerBlock, Locator::SELECTOR_XPATH);
         $datapicker->find($this->datePickerYear, Locator::SELECTOR_XPATH, 'select')->setValue($date[2]);

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

@@ -220,6 +220,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
         </variation>
         <variation name="CreateSimpleProductEntityTestVariation12" ticketId="MAGETWO-86225">
+            <data name="issue" xsi:type="string">MAGETWO-87569: [FAT] Fix unstable tests</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>

dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php

@@ -43,7 +43,23 @@ class SelectVersion extends Form
      *
      * @var string
      */
-    private $otherComponentsGrid = '.admin__data-grid-wrap[ng-show="componentsProcessed"]';
+    private $otherComponentsGrid = '.admin__data-grid-outer-wrap';
+
+    /**
+     * @var string
+     */
+    private $empty = '[ng-show="componentsProcessed && total == 0"]';
+
+    /**
+     * @var string
+     */
+    private $waitEmpty =
+        '//div[contains(@ng-show, "componentsProcessed && total") and not(contains(@class,"ng-hide"))]';
+
+    /**
+     * @var OtherComponentsGrid
+     */
+    private $otherComponentGrid;
 
     /**
      * Click on 'Next' button.
@@ -93,7 +109,33 @@ public function chooseUpgradeOtherComponents(array $packages)
     {
         $this->_rootElement->find("[for=yesUpdateComponents]")->click();
         $this->waitForElementNotVisible("[ng-show=\"!componentsProcessed\"");
-        $this->getOtherComponentsGrid()->setVersions($packages);
+
+        if (!$this->isComponentsEmpty()) {
+            $otherComponentGrid = $this->getOtherComponentsGrid();
+            $otherComponentGrid->setItemsPerPage(200);
+            $otherComponentGrid->setVersions($packages);
+        }
+    }
+
+    /**
+     * Check that grid is empty.
+     *
+     * @return bool
+     */
+    public function isComponentsEmpty()
+    {
+        $this->waitForElementVisible($this->waitEmpty, Locator::SELECTOR_XPATH);
+        return $this->_rootElement->find($this->empty)->isVisible();
+    }
+
+    /**
+     * Returns selected packages.
+     *
+     * @return array
+     */
+    public function getSelectedPackages()
+    {
+        return $this->getOtherComponentsGrid()->getSelectedPackages();
     }
 
     /**
@@ -103,9 +145,12 @@ public function chooseUpgradeOtherComponents(array $packages)
      */
     private function getOtherComponentsGrid()
     {
-        return $this->blockFactory->create(
-            OtherComponentsGrid::class,
-            ['element' => $this->_rootElement->find($this->otherComponentsGrid)]
-        );
+        if (!isset($this->otherComponentGrid)) {
+            $this->otherComponentGrid = $this->blockFactory->create(
+                OtherComponentsGrid::class,
+                ['element' => $this->_rootElement->find($this->otherComponentsGrid)]
+            );
+        }
+        return $this->otherComponentGrid;
     }
 }

dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php

@@ -6,6 +6,7 @@
 namespace Magento\Setup\Test\Block\SelectVersion;
 
 use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\ElementInterface;
 use Magento\Mtf\Client\Locator;
 use Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid\Item;
 
@@ -14,28 +15,61 @@ class OtherComponentsGrid extends Block
     /**
      * @var string
      */
-    private $itemComponent = '//tr[contains(@ng-repeat,"component") and //td[contains(.,"%s")]]';
+    private $itemComponent = '//tr[contains(@ng-repeat,"component") and ./td[contains(.,"%s")]]';
+
+    /**
+     * @var string
+     */
+    private $perPage = '#perPage';
+
+    /**
+     * @var array
+     */
+    private $selectedPackages = [];
 
     /**
      * @param $packages
      */
     public function setVersions(array $packages)
     {
         foreach ($packages as $package) {
-            $this->getComponentRow($package['name'])->setVersion($package['version']);
+            $selector = sprintf($this->itemComponent, $package['name']);
+            $elements = $this->_rootElement->getElements($selector, Locator::SELECTOR_XPATH);
+            foreach ($elements as $element) {
+                $row = $this->getComponentRow($element);
+                $row->setVersion($package['version']);
+                $this->selectedPackages[$row->getPackageName()] = $package['version'];
+            }
         }
     }
 
     /**
-     * @param string $componentName
+     * Returns selected packages.
+     *
+     * @return array
+     */
+    public function getSelectedPackages()
+    {
+        return $this->selectedPackages;
+    }
+
+    /**
+     * @param int $count
+     */
+    public function setItemsPerPage($count)
+    {
+        $this->_rootElement->find($this->perPage, Locator::SELECTOR_CSS, 'select')->setValue($count);
+    }
+
+    /**
+     * @param ElementInterface $element
      * @return Item
      */
-    private function getComponentRow($componentName)
+    private function getComponentRow($element)
     {
-        $selector = sprintf($this->itemComponent, $componentName);
         return $this->blockFactory->create(
             Item::class,
-            ['element' => $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)]
+            ['element' => $element]
         );
     }
 }

dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php

@@ -20,6 +20,13 @@ class Item extends Block
      */
     private $version = '[ng-change*="setComponentVersion"]';
 
+    /**
+     * CSS selector for package name element.
+     *
+     * @var string
+     */
+    private $packageName = 'td:nth-child(2)';
+
     /**
      * Set version for particular component.
      *
@@ -29,4 +36,14 @@ public function setVersion($version)
     {
         $this->_rootElement->find($this->version, Locator::SELECTOR_CSS, 'select')->setValue($version);
     }
+
+    /**
+     * Returns package name of element.
+     *
+     * @return array|string
+     */
+    public function getPackageName()
+    {
+        return $this->_rootElement->find($this->packageName)->getText();
+    }
 }

dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php

@@ -24,9 +24,9 @@ class AssertVersionAndEditionCheck extends AbstractConstraint
     public function processAssert(SetupWizard $setupWizard, array $upgrade)
     {
         $message = "We're ready to upgrade {$upgrade['package']} to {$upgrade['version']}.";
-        if (isset($upgrade['otherComponentsList'])) {
-            foreach ($upgrade['otherComponentsList'] as $item) {
-                $message .= "\nWe're ready to upgrade {$item['name']} to {$item['version']}.";
+        if ($upgrade['otherComponents'] === 'Yes' && isset($upgrade['selectedPackages'])) {
+            foreach ($upgrade['selectedPackages'] as $name => $version) {
+                $message .= "\nWe're ready to upgrade {$name} to {$version}.";
             }
         }
         $actualMessage = $setupWizard->getSystemUpgrade()->getUpgradeMessage();

dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php

@@ -124,6 +124,7 @@ public function test(
 
         // Check info and press 'Upgrade' button
         $upgrade['version'] = $version;
+        $upgrade['selectedPackages'] = $this->setupWizard->getSelectVersion()->getSelectedPackages();
         $assertVersionAndEdition->processAssert($this->setupWizard, $upgrade);
         $this->setupWizard->getSystemUpgrade()->clickSystemUpgrade();
 

dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml

@@ -18,6 +18,7 @@
             <data name="upgrade/optionsMedia" xsi:type="string">No</data>
             <data name="upgrade/optionsDb" xsi:type="string">No</data>
             <data name="upgrade/otherComponents" xsi:type="string">{otherComponents}</data>
+            <!-- If otherComponents value is Yes specify otherComponentsList items-->
             <data name="upgrade/otherComponentsList" xsi:type="array">
                 <item name="0" xsi:type="array">
                     <item name="name" xsi:type="string">{package_0_name}</item>