From 9b995387a40215181485b3fac2f9b6525a586088 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <okorshenko@magento.com>
Date: Mon, 5 Dec 2016 11:19:43 -0600
Subject: [PATCH 1/4] MAGETWO-61850: UI Upgrade Test failure when no other
 components to upgrade

 - changed CSS selector for other components page
 - added new events preset to improve logging for UI test
---
 dev/tests/functional/etc/events.xml                  | 12 ++++++++++++
 .../app/Magento/Upgrade/Test/Block/SelectVersion.php | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/etc/events.xml b/dev/tests/functional/etc/events.xml
index a2648835265dd..945e51b9bf161 100644
--- a/dev/tests/functional/etc/events.xml
+++ b/dev/tests/functional/etc/events.xml
@@ -43,4 +43,16 @@
             <tag name="webapi_failed" />
         </observer>
     </preset>
+    <preset name="upgrade" extends="base">
+        <observer class="Magento\Mtf\System\Observer\Screenshot">
+            <tag name="exception"/>
+            <tag name="failure"/>
+            <tag name="click_after"/>
+            <tag name="accept_alert_after"/>
+            <tag name="dismiss_alert_after"/>
+            <tag name="open_after"/>
+            <tag name="forward"/>
+            <tag name="back"/>
+        </observer>
+    </preset>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php b/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php
index d1979716e1f2c..da63d0222830e 100644
--- a/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php
+++ b/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php
@@ -30,6 +30,13 @@ class SelectVersion extends Form
      */
     protected $firstField = '#selectVersion';
 
+    /**
+     * Other components loader selector
+     *
+     * @var string
+     */
+    protected $loader = 'div[ng-show="updateComponents.yes && !upgradeProcessError"] > div.message.message-spinner';
+
     /**
      * Click on 'Next' button.
      *
@@ -61,6 +68,7 @@ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
     public function chooseUpgradeOtherComponents()
     {
         $this->_rootElement->find("[for=yesUpdateComponents]", Locator::SELECTOR_CSS)->click();
-        $this->waitForElementVisible("[ng-show='componentsProcessed']");
+        $this->waitForElementVisible($this->loader);
+        $this->waitForElementNotVisible($this->loader);
     }
 }

From e350d28bbfaf42d10e182bbcb8771b057ae6f653 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <okorshenko@magento.com>
Date: Mon, 5 Dec 2016 11:50:49 -0600
Subject: [PATCH 2/4] MAGETWO-61850: UI Upgrade Test failure when no other
 components to upgrade

  - code review changes
---
 .../tests/app/Magento/Upgrade/Test/Block/SelectVersion.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php b/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php
index da63d0222830e..0ad86d4abb8f4 100644
--- a/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php
+++ b/dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php
@@ -35,7 +35,7 @@ class SelectVersion extends Form
      *
      * @var string
      */
-    protected $loader = 'div[ng-show="updateComponents.yes && !upgradeProcessError"] > div.message.message-spinner';
+    private $loader = 'div[ng-show="updateComponents.yes && !upgradeProcessError"] > div.message.message-spinner';
 
     /**
      * Click on 'Next' button.

From 0f63db694252dd25f8f3dd0b5264a7b00cc3ff56 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <okorshenko@magento.com>
Date: Mon, 5 Dec 2016 12:09:16 -0600
Subject: [PATCH 3/4] MAGETWO-61850: UI Upgrade Test failure when no other
 components to upgrade

  - renamed upgrade events_preset to debug
---
 dev/tests/functional/etc/events.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/etc/events.xml b/dev/tests/functional/etc/events.xml
index 945e51b9bf161..6086044c720b9 100644
--- a/dev/tests/functional/etc/events.xml
+++ b/dev/tests/functional/etc/events.xml
@@ -43,7 +43,7 @@
             <tag name="webapi_failed" />
         </observer>
     </preset>
-    <preset name="upgrade" extends="base">
+    <preset name="debug" extends="base">
         <observer class="Magento\Mtf\System\Observer\Screenshot">
             <tag name="exception"/>
             <tag name="failure"/>

From 78dbbbbec794495d2810e547630bfecf09e4265f Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <okorshenko@magento.com>
Date: Mon, 5 Dec 2016 12:15:32 -0600
Subject: [PATCH 4/4] MAGETWO-61850: UI Upgrade Test failure when no other
 components to upgrade

  - added SourceCode logging for debug events preset
---
 dev/tests/functional/etc/events.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dev/tests/functional/etc/events.xml b/dev/tests/functional/etc/events.xml
index 6086044c720b9..3f24c78b6095c 100644
--- a/dev/tests/functional/etc/events.xml
+++ b/dev/tests/functional/etc/events.xml
@@ -54,5 +54,15 @@
             <tag name="forward"/>
             <tag name="back"/>
         </observer>
+        <observer class="Magento\Mtf\System\Observer\SourceCode">
+            <tag name="exception"/>
+            <tag name="failure"/>
+            <tag name="click_after"/>
+            <tag name="accept_alert_after"/>
+            <tag name="dismiss_alert_after"/>
+            <tag name="open_after"/>
+            <tag name="forward"/>
+            <tag name="back"/>
+        </observer>
     </preset>
 </config>