Skip to content

Commit e797e86

Browse files
author
Dmytro Aponasenko
committed
MTA-1814: Analyse functional test failures - Sprint 9
1 parent b7267ed commit e797e86

File tree

6 files changed

+86
-92
lines changed

6 files changed

+86
-92
lines changed

‎dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ private function prepareForSearch(array $filters)
226226
: null;
227227
$this->_rootElement->find($selector, $strategy, $typifiedElement)->setValue($value);
228228
} else {
229-
throw new \Exception('Such column is absent in the grid or not described yet.');
229+
throw new \Exception("Column $key is absent in the grid or not described yet.");
230230
}
231231
}
232232
}

‎dev/tests/functional/tests/app/Magento/Cms/Test/Block/Page.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
class Page extends Block
1616
{
1717
/**
18-
* Selector for uninitialized page.
18+
* Selector for initial script.
1919
*
2020
* @var string
2121
*/
22-
protected $uninitialized = '//*[(@data-mage-init)]';
22+
protected $initialScript = 'script[type="text/x-magento-init"]';
2323

2424
/**
2525
* Cms page content class.
@@ -122,14 +122,7 @@ public function isWidgetVisible($widgetType, $widgetText)
122122
*/
123123
public function waitPageInit()
124124
{
125-
$browser = $this->browser;
126-
$uninitialized = $this->uninitialized;
127-
128-
$this->_rootElement->waitUntil(
129-
function () use ($browser, $uninitialized) {
130-
return $browser->find($uninitialized, Locator::SELECTOR_XPATH)->isVisible() == false ? true : null;
131-
}
132-
);
125+
$this->waitForElementNotVisible($this->initialScript);
133126
sleep(3); // TODO: remove after resolving an issue with ajax on Frontend.
134127
}
135128
}

‎dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public function run()
4343
if ($this->cmsIndex->getLinksBlock()->isLinkVisible("Log Out")) {
4444
$this->cmsIndex->getLinksBlock()->openLink("Log Out");
4545
$this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');
46+
$this->cmsIndex->getCmsPageBlock()->waitPageInit();
4647
}
4748
}
4849
}

‎dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.xml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,38 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
9-
<fixture name="store" module="Magento_Store" type="flat" entity_type="store" collection="Magento\Store\Model\Resource\Store\Collection" repository_class="Magento\Store\Test\Repository\Store" handler_interface="Magento\Store\Test\Handler\Store\StoreInterface" class="Magento\Store\Test\Fixture\Store">
10-
<dataset name="default">
11-
<field name="group_id" xsi:type="array">
12-
<item name="dataSet" xsi:type="string">default</item>
9+
<fixture name="store" module="Magento_Store" type="flat" entity_type="store" collection="Magento\Store\Model\Resource\Store\Collection" repository_class="Magento\Store\Test\Repository\Store" handler_interface="Magento\Store\Test\Handler\Store\StoreInterface" class="Magento\Store\Test\Fixture\Store">
10+
<dataset name="default">
11+
<field name="group_id" xsi:type="array">
12+
<item name="dataSet" xsi:type="string">default</item>
13+
</field>
14+
<field name="name" xsi:type="string">Default Store View</field>
15+
<field name="code" xsi:type="string">default</field>
16+
<field name="is_active" xsi:type="string">Enabled</field>
17+
<field name="store_id" xsi:type="string">1</field>
18+
</dataset>
19+
<field name="store_id" is_required="1">
20+
<default_value xsi:type="string">1</default_value>
21+
</field>
22+
<field name="code" is_required="">
23+
<default_value xsi:type="string">default</default_value>
1324
</field>
14-
<field name="name" xsi:type="string">Default Store View</field>
15-
<field name="code" xsi:type="string">default</field>
16-
<field name="is_active" xsi:type="string">Enabled</field>
17-
<field name="store_id" xsi:type="string">1</field>
18-
</dataset>
19-
<field name="store_id" is_required="1">
20-
<default_value xsi:type="string">1</default_value>
21-
</field>
22-
<field name="code" is_required="">
23-
<default_value xsi:type="string">default</default_value>
24-
</field>
25-
<field name="website_id" is_required="">
26-
<default_value xsi:type="number">0</default_value>
27-
</field>
28-
<field name="group_id" is_required="" source="Magento\Store\Test\Fixture\Store\GroupId">
29-
<default_value xsi:type="array">
25+
<field name="website_id" is_required="">
26+
<default_value xsi:type="number">0</default_value>
27+
</field>
28+
<field name="group_id" is_required="" source="Magento\Store\Test\Fixture\Store\GroupId">
29+
<default_value xsi:type="array">
3030
<item name="dataSet" xsi:type="string">default</item>
3131
</default_value>
32-
</field>
33-
<field name="name" is_required="">
34-
<default_value xsi:type="string">Default Store View</default_value>
35-
</field>
36-
<field name="sort_order" is_required="">
37-
<default_value xsi:type="number">0</default_value>
38-
</field>
39-
<field name="is_active" is_required="">
40-
<default_value xsi:type="string">Enabled</default_value>
41-
</field>
42-
</fixture>
32+
</field>
33+
<field name="name" is_required="">
34+
<default_value xsi:type="string">Default Store View</default_value>
35+
</field>
36+
<field name="sort_order" is_required="">
37+
<default_value xsi:type="number">0</default_value>
38+
</field>
39+
<field name="is_active" is_required="">
40+
<default_value xsi:type="string">Enabled</default_value>
41+
</field>
42+
</fixture>
4343
</config>

‎dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.xml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,34 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
9-
<fixture name="storeGroup" module="Magento_Store" type="flat" entity_type="store_group" collection="Magento\Store\Model\Resource\Group\Collection" identifier="" repository_class="Magento\Store\Test\Repository\StoreGroup" handler_interface="Magento\Store\Test\Handler\StoreGroup\StoreGroupInterface" class="Magento\Store\Test\Fixture\StoreGroup">
10-
<dataset name="default">
11-
<field name="website_id" xsi:type="array">
12-
<item name="dataSet" xsi:type="string">main_website</item>
13-
</field>
14-
<field name="name" xsi:type="string">StoreGroup%isolation%</field>
15-
<field name="root_category_id" xsi:type="array">
16-
<item name="dataSet" xsi:type="string">default_category</item>
9+
<fixture name="storeGroup" module="Magento_Store" type="flat" entity_type="store_group" collection="Magento\Store\Model\Resource\Group\Collection" identifier="" repository_class="Magento\Store\Test\Repository\StoreGroup" handler_interface="Magento\Store\Test\Handler\StoreGroup\StoreGroupInterface" class="Magento\Store\Test\Fixture\StoreGroup">
10+
<dataset name="default">
11+
<field name="website_id" xsi:type="array">
12+
<item name="dataSet" xsi:type="string">main_website</item>
13+
</field>
14+
<field name="name" xsi:type="string">StoreGroup%isolation%</field>
15+
<field name="root_category_id" xsi:type="array">
16+
<item name="dataSet" xsi:type="string">default_category</item>
17+
</field>
18+
</dataset>
19+
<field name="group_id" is_required="1">
20+
<default_value xsi:type="null" />
1721
</field>
18-
</dataset>
19-
<field name="group_id" is_required="1">
20-
<default_value xsi:type="null"/>
21-
</field>
22-
<field name="website_id" source="Magento\Store\Test\Fixture\StoreGroup\WebsiteId">
23-
<default_value xsi:type="array">
22+
<field name="website_id" source="Magento\Store\Test\Fixture\StoreGroup\WebsiteId">
23+
<default_value xsi:type="array">
2424
<item name="dataSet" xsi:type="string">main_website</item>
2525
</default_value>
26-
</field>
27-
<field name="name" is_required="">
28-
<default_value xsi:type="string">StoreGroup%isolation%</default_value>
29-
</field>
30-
<field name="root_category_id" source="Magento\Store\Test\Fixture\StoreGroup\CategoryId">
31-
<default_value xsi:type="array">
26+
</field>
27+
<field name="name" is_required="">
28+
<default_value xsi:type="string">StoreGroup%isolation%</default_value>
29+
</field>
30+
<field name="root_category_id" source="Magento\Store\Test\Fixture\StoreGroup\CategoryId">
31+
<default_value xsi:type="array">
3232
<item name="dataSet" xsi:type="string">default_category</item>
3333
</default_value>
34-
</field>
35-
<field name="default_store_id" is_required="">
36-
<default_value xsi:type="number">0</default_value>
37-
</field>
38-
</fixture>
34+
</field>
35+
<field name="default_store_id" is_required="">
36+
<default_value xsi:type="number">0</default_value>
37+
</field>
38+
</fixture>
3939
</config>

‎dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.xml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
9-
<fixture name="website" module="Magento_Store" type="flat" entity_type="store_website" collection="Magento\Store\Model\Resource\Website\Collection" identifier="code" repository_class="Magento\Store\Test\Repository\Website" handler_interface="Magento\Store\Test\Handler\Website\WebsiteInterface" class="Magento\Store\Test\Fixture\Website">
10-
<dataset name="default">
11-
<field name="name" xsi:type="string">Main Website</field>
12-
<field name="code" xsi:type="string">base</field>
13-
<field name="website_id" xsi:type="string">1</field>
14-
</dataset>
15-
<field name="website_id" is_required="1">
16-
<default_value xsi:type="string">1</default_value>
17-
</field>
18-
<field name="code" is_required="">
19-
<default_value xsi:type="string">base</default_value>
20-
</field>
21-
<field name="name" is_required="">
22-
<default_value xsi:type="string">Main Website</default_value>
23-
</field>
24-
<field name="sort_order" is_required="">
25-
<default_value xsi:type="number">0</default_value>
26-
</field>
27-
<field name="default_group_id" is_required="">
28-
<default_value xsi:type="number">0</default_value>
29-
</field>
30-
<field name="is_default" is_required="">
31-
<default_value xsi:type="number">0</default_value>
32-
</field>
33-
</fixture>
9+
<fixture name="website" module="Magento_Store" type="flat" entity_type="store_website" collection="Magento\Store\Model\Resource\Website\Collection" identifier="code" repository_class="Magento\Store\Test\Repository\Website" handler_interface="Magento\Store\Test\Handler\Website\WebsiteInterface" class="Magento\Store\Test\Fixture\Website">
10+
<dataset name="default">
11+
<field name="name" xsi:type="string">Main Website</field>
12+
<field name="code" xsi:type="string">base</field>
13+
<field name="website_id" xsi:type="string">1</field>
14+
</dataset>
15+
<field name="website_id" is_required="1">
16+
<default_value xsi:type="string">1</default_value>
17+
</field>
18+
<field name="code" is_required="">
19+
<default_value xsi:type="string">base</default_value>
20+
</field>
21+
<field name="name" is_required="">
22+
<default_value xsi:type="string">Main Website</default_value>
23+
</field>
24+
<field name="sort_order" is_required="">
25+
<default_value xsi:type="number">0</default_value>
26+
</field>
27+
<field name="default_group_id" is_required="">
28+
<default_value xsi:type="number">0</default_value>
29+
</field>
30+
<field name="is_default" is_required="">
31+
<default_value xsi:type="number">0</default_value>
32+
</field>
33+
</fixture>
3434
</config>

0 commit comments

Comments
 (0)