Merge remote-tracking branch 'origin/MAGETWO-69192-Upgrade-Tests' into 2.2-develop-pr

Author: cpartica

dev/tests/functional/lib/Magento/Mtf/App/State/State1.php

@@ -44,7 +44,7 @@ class State1 extends AbstractState
     public function __construct(
         ObjectManager $objectManager,
         CurlTransport $curlTransport,
-        array $arguments
+        array $arguments = []
     ) {
         parent::__construct($objectManager, $arguments);
         $this->objectManager = $objectManager;

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

@@ -31,18 +31,31 @@ class UpgradeSystemTest extends Injectable
     protected $adminDashboard;
 
     /**
-     * Injection data.
-     *
+     * @var \Magento\Analytics\Mtf\App\State\NotificationTimeHandler
+     */
+    private $analyticsNotificationHandler;
+
+    /**
+     * @var \Magento\Mtf\Util\Iterator\ApplicationState
+     */
+    private $applicationStateIterator;
+
+    /**
      * @param Dashboard $adminDashboard
      * @param SetupWizard $setupWizard
-     * @return void
+     * @param \Magento\Analytics\Mtf\App\State\NotificationTimeHandler $analyticsNotificationHandler
+     * @param \Magento\Mtf\Util\Iterator\ApplicationState $applicationStateIterator
      */
     public function __inject(
         Dashboard $adminDashboard,
-        SetupWizard $setupWizard
+        SetupWizard $setupWizard,
+        \Magento\Analytics\Mtf\App\State\NotificationTimeHandler $analyticsNotificationHandler,
+        \Magento\Mtf\Util\Iterator\ApplicationState $applicationStateIterator
     ) {
         $this->adminDashboard = $adminDashboard;
         $this->setupWizard = $setupWizard;
+        $this->analyticsNotificationHandler = $analyticsNotificationHandler;
+        $this->applicationStateIterator = $applicationStateIterator;
     }
 
     /**
@@ -128,6 +141,11 @@ public function test(
 
         $assertSuccessMessage->processAssert($this->setupWizard, $upgrade['package']);
 
+        // Disable promotion popup for Analytics module
+        $appStateMetadata = $this->applicationStateIterator->current();
+        $appState = \Magento\Mtf\ObjectManager::getInstance()->get($appStateMetadata['class']);
+        $this->analyticsNotificationHandler->execute($appState);
+
         // Check application version
         $this->adminDashboard->open();
         $assertApplicationVersion->processAssert($this->adminDashboard, $version);

dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt

@@ -59,6 +59,7 @@ Model3
 \Magento\TestModule2\Service\V1\Entity\ItemBuilder
 \Magento\TestModule4\Service\V1\Entity\DataObjectResponse
 \Magento\TestModule4\Service\V1\Entity\DataObjectRequest
+\Magento\Mtf\ObjectManager
 \Magento\Mtf\ObjectManager\Config\Mapper\Dom
 \Magento\Mtf\Data\Argument\Interpreter\Constant
 \Magento\Mtf\Data\Argument\Interpreter\Boolean