Merge remote-tracking branch 'origin/MTA-2996' into MTA-2996

Author: vgoncharenko

dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php

@@ -57,7 +57,7 @@ class Install extends Block
     public function clickInstallNow()
     {
         $this->_rootElement->find($this->installNow, Locator::SELECTOR_XPATH)->click();
-        $this->waitForElementVisible($this->launchAdmin, Locator::SELECTOR_CSS);
+        $this->waitSuccessInstall();
     }
 
     /**
@@ -131,8 +131,18 @@ public function isInstallationCompleted()
      *
      * @return void
      */
-    public function waitSuccessInstall()
+    private function waitSuccessInstall()
     {
-        $this->waitForElementVisible($this->successInstallText, Locator::SELECTOR_XPATH);
+        $root = $this->_rootElement;
+        $successInstallText = $this->successInstallText;
+        $launchAdmin = $this->launchAdmin;
+
+        $root->waitUntil(
+            function () use ($root, $successInstallText, $launchAdmin) {
+                $isInstallText = $root->find($successInstallText, Locator::SELECTOR_XPATH)->isVisible();
+                $isLaunchAdmin = $root->find($launchAdmin, Locator::SELECTOR_CSS)->isVisible();
+                return $isInstallText == true || $isLaunchAdmin == true ? true : null;
+            }
+        );
     }
 }

dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php

@@ -38,13 +38,6 @@ class AssertSuccessInstall extends AbstractConstraint
         ['pageData' => 'username', 'fixture' => 'dbUser']
     ];
 
-    /**
-     * Install page.
-     *
-     * @var Install
-     */
-    private $installPage;
-
     /**
      * Assert that Magento successfully installed.
      *
@@ -56,8 +49,10 @@ class AssertSuccessInstall extends AbstractConstraint
     public function processAssert(Install $installPage, InstallConfig $installConfig, User $user)
     {
         //TODO Nginx server does't make redirect after installation (random fail)
-        $this->installPage = $installPage;
-        $this->waitSuccessPage();
+        sleep(5);
+        if ($installPage->getInstallBlock()->isInstallationCompleted()) {
+            return;
+        }
         $adminData = $installPage->getInstallBlock()->getAdminInfo();
         $dbData = $installPage->getInstallBlock()->getDbInfo();
 
@@ -86,20 +81,6 @@ public function processAssert(Install $installPage, InstallConfig $installConfig
         }
     }
 
-    /**
-     * Wait for success install page.
-     *
-     * @return void
-     */
-    private function waitSuccessPage()
-    {
-        $this->installPage->getInstallBlock()->waitSuccessInstall();
-        sleep(5);
-        if ($this->installPage->getInstallBlock()->isInstallationCompleted()) {
-            $this->installPage->open();
-        }
-    }
-
     /**
      * Returns a string representation of successful assertion.
      *