MAGETWO-98181: [FT] NavigateMenuTest with NavigateMenuTestBIEssentials variation fails n Jenkins

Author: zakdma

dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertBIEssentialsLink.php

@@ -63,6 +63,7 @@ public function processAssert(
             } catch (\Throwable $e) {
                 $dashboard->open();
                 $dashboard->getMenuBlock()->navigate($menuItem, $waitMenuItemNotVisible);
+                sleep(10);
                 $count++;
             }
         } while ($count < self::MAX_TRY_COUNT);

dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml

@@ -8,16 +8,17 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate to menu chapter">
         <variation name="NavigateMenuTestBIEssentials" summary="Navigate through BI Essentials admin menu to Sign Up page" ticketId="MAGETWO-63700">
-            <data name="issue" xsi:type="string">MAGETWO-97298: [2.2-develop] Magento\Backend\Test\TestCase\NavigateMenuTest fails on Jenkins</data>
             <data name="menuItem" xsi:type="string">Reports > BI Essentials</data>
             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
             <data name="businessIntelligenceLink" xsi:type="string">https://account.magento.com/onboarding/steps/view/step/gmv/</data>
+            <data name="waitForNewWindow" xsi:type="boolean">true</data>
             <constraint name="Magento\Analytics\Test\Constraint\AssertBIEssentialsLink" />
         </variation>
         <variation name="NavigateMenuTestAdvancedReporting" summary="Navigate through Advanced Reporting admin menu to BI Reports page" ticketId="MAGETWO-65748">
             <data name="menuItem" xsi:type="string">Reports > Advanced Reporting</data>
             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
             <data name="advancedReportingLink" xsi:type="string">https://advancedreporting.rjmetrics.com/report</data>
+            <data name="waitForNewWindow" xsi:type="boolean">true</data>
             <constraint name="Magento\Analytics\Test\Constraint\AssertAdvancedReportingPage" />
         </variation>
     </testCase>

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Backend\Test\TestCase;
 
+use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 
@@ -23,17 +24,46 @@ class NavigateMenuTest extends Injectable
     const MVP = 'no';
     /* end tags */
 
+    /**
+     * Browser instance.
+     *
+     * @var BrowserInterface
+     */
+    protected $browser;
+
+    /**
+     * Prepare data for further test execution.
+     *
+     * @param BrowserInterface $browser
+     * @return void
+     */
+    public function __inject(
+        BrowserInterface $browser
+    ) {
+        $this->browser = $browser;
+    }
+
     /**
      * Run menu navigation test.
      *
      * @param Dashboard $dashboard
      * @param string $menuItem
      * @param bool $waitMenuItemNotVisible
+     * @param bool $waitForNewWindow
      * @return void
      */
-    public function test(Dashboard $dashboard, $menuItem, $waitMenuItemNotVisible = true)
+    public function test(Dashboard $dashboard, $menuItem, $waitMenuItemNotVisible = true, $waitForNewWindow = false)
     {
         $dashboard->open();
+        $windowsCountBeforeClick = count($this->browser->getWindowHandles());
         $dashboard->getMenuBlock()->navigate($menuItem, $waitMenuItemNotVisible);
+        if ($waitForNewWindow) {
+            $this->browser->waitUntil(function () use ($windowsCountBeforeClick) {
+                $windowsCount = count($this->browser->getWindowHandles());
+
+                return $windowsCount > $windowsCountBeforeClick ? true : null;
+            });
+            sleep(10);
+        }
     }
 }