MAGETWO-55271: Cover with Functional Tests

Author: shiftedreality

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

@@ -8,6 +8,7 @@
 
 use Magento\Mtf\Block\Block;
 use Magento\Mtf\Client\Locator;
+use Magento\Setup\Test\Fixture\Extension;
 
 /**
  * Readiness block.
@@ -28,6 +29,20 @@ class Readiness extends Block
      */
     protected $next = "[ng-click*='next']";
 
+    /**
+     * 'Try Again' button.
+     *
+     * @var string
+     */
+    protected $tryAgain = "[ng-click*='forceReload']";
+
+    /**
+     * Trash Bin icon.
+     *
+     * @var string
+     */
+    protected $removeExtension = '//li[contains(text(), \'%s\')]//button';
+
     /**
      * 'Completed!' message.
      * [ng-switch-when="true"]
@@ -98,6 +113,30 @@ public function clickNext()
         $this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
     }
 
+    /**
+     * Click on 'Try Again' button.
+     *
+     * @return void
+     */
+    public function clickTryAgain()
+    {
+        $this->_rootElement->find($this->tryAgain, Locator::SELECTOR_CSS)->click();
+        $this->waitForElementVisible($this->completedMessage, Locator::SELECTOR_CSS);
+    }
+
+    /**
+     * Click Trash Bin icon.
+     *
+     * @param Extension $extension
+     * @return void
+     */
+    public function clickRemoveExtension(Extension $extension)
+    {
+        $removeExtension = sprintf($this->removeExtension, $extension->getExtensionName());
+
+        $this->_rootElement->find($removeExtension, Locator::SELECTOR_XPATH)->click();
+    }
+
     /**
      * Get Updater application check result.
      *

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

@@ -79,14 +79,34 @@ protected function readinessCheckAndBackup(
         AssertSuccessfulReadinessCheck $assertReadiness,
         BackupOptions $backupOptions
     ) {
+        $this->readinessCheck($assertReadiness);
+        $this->setupWizard->getReadiness()->clickNext();
+        $this->backup($backupOptions);
+        $this->setupWizard->getCreateBackup()->clickNext();
+    }
+
+    /**
+     * Perform Readiness check.
+     *
+     * @param AssertSuccessfulReadinessCheck $assertReadiness
+     */
+    protected function readinessCheck(AssertSuccessfulReadinessCheck $assertReadiness)
+    {
         // Readiness Check
         $this->setupWizard->getReadiness()->clickReadinessCheck();
+
         $assertReadiness->processAssert($this->setupWizard);
-        $this->setupWizard->getReadiness()->clickNext();
+    }
 
+    /**
+     * Perform Backup.
+     *
+     * @param BackupOptions $backupOptions
+     */
+    protected function backup(BackupOptions $backupOptions)
+    {
         // Create Backup page
         $this->setupWizard->getCreateBackup()->fill($backupOptions);
-        $this->setupWizard->getCreateBackup()->clickNext();
     }
 
     /**

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

@@ -34,6 +34,7 @@ class ExtensionMultipleUpdateTest extends AbstractExtensionTest
      * @param AssertSelectSeveralExtensions $assertSelectSeveralExtensions
      * @param $needAuthentication
      * @param array $extensions
+     * @param array $removeExtensions
      */
     public function test(
         FixtureFactory $fixtureFactory,
@@ -46,12 +47,17 @@ public function test(
         AssertMultipleUpdateSuccessMessage $assertMultipleUpdateSuccessMessage,
         AssertSelectSeveralExtensions $assertSelectSeveralExtensions,
         $needAuthentication,
-        array $extensions
+        array $extensions,
+        array $removeExtensions
     ) {
         foreach ($extensions as $key => $options) {
             $extensions[$key] = $fixtureFactory->create(Extension::class, $options);
         }
 
+        foreach ($removeExtensions as $key => $options) {
+            $removeExtensions[$key] = $fixtureFactory->create(Extension::class, $options);
+        }
+
         // Authenticate in admin area
         $this->adminDashboard->open();
 
@@ -83,15 +89,28 @@ public function test(
         // Click general "Update" button
         $this->setupWizard->getExtensionsUpdateGrid()->clickUpdateAllButton();
 
-        $this->readinessCheckAndBackup($assertReadiness, $backupOptions);
+        $this->readinessCheck($assertReadiness);
+
+        /** @var Extension $removeExtension */
+        foreach ($removeExtensions as $removeExtension) {
+            $this->setupWizard->getReadiness()->clickRemoveExtension($removeExtension);
+        }
+
+        $this->setupWizard->getReadiness()->clickTryAgain();
+        $assertReadiness->processAssert($this->setupWizard);
+        $this->setupWizard->getReadiness()->clickNext();
+        $this->backup($backupOptions);
+        $this->setupWizard->getCreateBackup()->clickNext();
 
         // Start installing
         $this->setupWizard->getUpdaterExtension()->clickStartButton();
 
+        $updatedExtensions = array_diff_key($extensions, $removeExtensions);
+
         // Check success message
         $assertMultipleUpdateSuccessMessage->processAssert(
             $this->setupWizard,
-            $extensions,
+            $updatedExtensions,
             AssertSuccessMessage::TYPE_UPDATE
         );
 

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

@@ -17,6 +17,11 @@
                     <item name="dataset" xsi:type="string">secondExtension</item>
                 </item>
             </data>
+            <data name="removeExtensions" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">firstExtension</item>
+                </item>
+            </data>
         </variation>
     </testCase>
 </config>