Merge remote-tracking branch 'api/MAGETWO-53947-Upgrade-Test' into pull-request

Author: Cari Spruiell

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

@@ -52,4 +52,15 @@ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
         $this->waitForElementVisible($this->firstField);
         return parent::fill($fixture, $element);
     }
+
+    /**
+     * Choose 'yes' for upgrade option called 'Other components'
+     *
+     * @return void
+     */
+    public function chooseUpgradeOtherComponents()
+    {
+        $this->_rootElement->find("[for=yesUpdateComponents]", Locator::SELECTOR_CSS)->click();
+        $this->waitForElementVisible("[ng-show='componentsProcessed']");
+    }
 }

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

@@ -106,6 +106,9 @@ public function test(
         // Select upgrade to version
         $this->setupWizard->getSystemUpgradeHome()->clickSystemUpgrade();
         $this->setupWizard->getSelectVersion()->fill($upgradeFixture);
+        if ($upgrade['otherComponents'] === 'Yes') {
+            $this->setupWizard->getSelectVersion()->chooseUpgradeOtherComponents();
+        }
         $this->setupWizard->getSelectVersion()->clickNext();
 
         // Readiness Check

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

@@ -17,6 +17,7 @@
             <data name="upgrade/optionsCode" xsi:type="string">No</data>
             <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>
         </variation>
     </testCase>
 </config>