Merge pull request #650 from magento-fearless-kiwis/MAGETWO-61850-2.1…

…-upgrade-test MAGETWO-61850: UI Upgrade Test
magento · Dec 5, 2016 · 924ea3f · 924ea3f
2 parents 5c0ee0f + 78dbbbb
commit 924ea3f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/dev/tests/functional/etc/events.xml b/dev/tests/functional/etc/events.xml
@@ -43,4 +43,26 @@
             <tag name="webapi_failed" />
         </observer>
     </preset>
+    <preset name="debug" 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>
+        <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>
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
@@ -30,6 +30,13 @@ class SelectVersion extends Form
      */
     protected $firstField = '#selectVersion';
 
+    /**
+     * Other components loader selector
+     *
+     * @var string
+     */
+    private $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);
     }
 }