Skip to content

Commit 924ea3f

Browse files
author
Oleksii Korshenko
authored
Merge pull request #650 from magento-fearless-kiwis/MAGETWO-61850-2.1-upgrade-test
MAGETWO-61850: UI Upgrade Test
2 parents 5c0ee0f + 78dbbbb commit 924ea3f

File tree

2 files changed

+31
-1
lines changed

2 files changed

+31
-1
lines changed

dev/tests/functional/etc/events.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,26 @@
4343
<tag name="webapi_failed" />
4444
</observer>
4545
</preset>
46+
<preset name="debug" extends="base">
47+
<observer class="Magento\Mtf\System\Observer\Screenshot">
48+
<tag name="exception"/>
49+
<tag name="failure"/>
50+
<tag name="click_after"/>
51+
<tag name="accept_alert_after"/>
52+
<tag name="dismiss_alert_after"/>
53+
<tag name="open_after"/>
54+
<tag name="forward"/>
55+
<tag name="back"/>
56+
</observer>
57+
<observer class="Magento\Mtf\System\Observer\SourceCode">
58+
<tag name="exception"/>
59+
<tag name="failure"/>
60+
<tag name="click_after"/>
61+
<tag name="accept_alert_after"/>
62+
<tag name="dismiss_alert_after"/>
63+
<tag name="open_after"/>
64+
<tag name="forward"/>
65+
<tag name="back"/>
66+
</observer>
67+
</preset>
4668
</config>

dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ class SelectVersion extends Form
3030
*/
3131
protected $firstField = '#selectVersion';
3232

33+
/**
34+
* Other components loader selector
35+
*
36+
* @var string
37+
*/
38+
private $loader = 'div[ng-show="updateComponents.yes && !upgradeProcessError"] > div.message.message-spinner';
39+
3340
/**
3441
* Click on 'Next' button.
3542
*
@@ -61,6 +68,7 @@ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
6168
public function chooseUpgradeOtherComponents()
6269
{
6370
$this->_rootElement->find("[for=yesUpdateComponents]", Locator::SELECTOR_CSS)->click();
64-
$this->waitForElementVisible("[ng-show='componentsProcessed']");
71+
$this->waitForElementVisible($this->loader);
72+
$this->waitForElementNotVisible($this->loader);
6573
}
6674
}

0 commit comments

Comments
 (0)