Merge pull request #1348 from magento-tsg/2.1.8-develop-pr23

[TSG] Backporting for 2.1 (pr23) (2.1.8)

Author: wert2all

dev/tests/functional/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc47",
+        "magento/mtf": "2.1.x-dev",
         "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2"

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php

@@ -50,6 +50,7 @@ function () {
      */
     public function fillFormData(array $data)
     {
+        $this->waitLoader();
         $data = $this->prepareData($data);
         if (isset($data['form_data'])) {
             $data['form_data'] = $this->dataMapping($data['form_data']);

dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php

@@ -7,6 +7,7 @@
 namespace Magento\User\Test\TestStep;
 
 use Magento\Backend\Test\Page\AdminAuthLogin;
+use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\TestStep\TestStepInterface;
 use Magento\User\Test\Fixture\User;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
@@ -44,23 +45,43 @@ class LoginUserOnBackendStep implements TestStepInterface
      */
     protected $dashboard;
 
+    /**
+     * Browser.
+     *
+     * @var BrowserInterface
+     */
+    private $browser;
+
+    /**
+     * Array of error messages on admin login form.
+     *
+     * @var array
+     */
+    private $errorMessages = [
+        'Invalid Form Key. Please refresh the page.',
+        'Your current session has been expired.',
+    ];
+
     /**
      * @constructor
      * @param LogoutUserOnBackendStep $logoutUserOnBackendStep
      * @param AdminAuthLogin $adminAuth
      * @param User $user
      * @param Dashboard $dashboard
+     * @param BrowserInterface $browser
      */
     public function __construct(
         LogoutUserOnBackendStep $logoutUserOnBackendStep,
         AdminAuthLogin $adminAuth,
         User $user,
-        Dashboard $dashboard
+        Dashboard $dashboard,
+        BrowserInterface $browser
     ) {
         $this->logoutUserOnBackendStep = $logoutUserOnBackendStep;
         $this->adminAuth = $adminAuth;
         $this->user = $user;
         $this->dashboard = $dashboard;
+        $this->browser = $browser;
     }
 
     /**
@@ -76,10 +97,25 @@ public function run()
             $this->logoutUserOnBackendStep->run();
         }
 
+        try {
+            $this->login();
+        } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+            if (strpos($e->getMessage(), 'Timed out after') !== false) {
+                $messages = $this->adminAuth->getMessagesBlock();
+                if (in_array($messages->getErrorMessage(), $this->errorMessages, true)) {
+                    $this->browser->refresh();
+                    $this->login();
+                }
+            }
+        }
+
+        $this->dashboard->getSystemMessageDialog()->closePopup();
+    }
+
+    private function login()
+    {
         $this->adminAuth->getLoginBlock()->fill($this->user);
         $this->adminAuth->getLoginBlock()->submit();
         $this->adminAuth->getLoginBlock()->waitFormNotVisible();
-
-        $this->dashboard->getSystemMessageDialog()->closePopup();
     }
 }