Skip to content

Commit 2d429d1

Browse files
author
Vitaliy Honcharenko
committed
MTA-2340: Catalog module functional tests maintenance. Category & Product
- fixed random fail on bamboo
1 parent a4bab5d commit 2d429d1

File tree

2 files changed

+38
-20
lines changed

2 files changed

+38
-20
lines changed

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Magento\Cms\Test\Fixture\CmsPage as CmsPageFixture;
1010
use Magento\Cms\Test\Page\Adminhtml\CmsPageIndex;
1111
use Magento\Cms\Test\Page\Adminhtml\CmsPageNew;
12+
use Magento\Mtf\Fixture\FixtureFactory;
1213
use Magento\Mtf\TestCase\Injectable;
1314

1415
/**
@@ -45,33 +46,46 @@ class CreateCmsPageEntityTest extends Injectable
4546
*/
4647
protected $cmsPageNew;
4748

49+
/**
50+
* Fixture factory.
51+
*
52+
* @var FixtureFactory
53+
*/
54+
protected $fixtureFactory;
55+
4856
/**
4957
* Inject pages.
5058
*
5159
* @param CmsPageIndex $cmsIndex
5260
* @param CmsPageNew $cmsPageNew
61+
* @param FixtureFactory $fixtureFactory
5362
* @return void
5463
*/
55-
public function __inject(CmsPageIndex $cmsIndex, CmsPageNew $cmsPageNew)
64+
public function __inject(CmsPageIndex $cmsIndex, CmsPageNew $cmsPageNew, FixtureFactory $fixtureFactory)
5665
{
5766
$this->cmsIndex = $cmsIndex;
5867
$this->cmsPageNew = $cmsPageNew;
68+
$this->fixtureFactory = $fixtureFactory;
5969
}
6070

6171
/**
6272
* Creating Cms page.
6373
*
64-
* @param CmsPageFixture $cms
65-
* @return void
74+
* @param array $data
75+
* @param string $fixtureType
76+
* @return array
6677
*/
67-
public function test(CmsPageFixture $cms)
78+
public function test(array $data, $fixtureType)
6879
{
6980
// Steps
81+
$cms = $this->fixtureFactory->createByCode($fixtureType, ['data' => $data]);
7082
$this->cmsIndex->open();
7183
$this->cmsIndex->getPageActionsBlock()->addNew();
7284
//TODO: remove cms page new refresh after resolve issue with static js files publication (MAGETWO-37898)
7385
$this->cmsPageNew->open();
7486
$this->cmsPageNew->getPageForm()->fill($cms);
7587
$this->cmsPageNew->getPageMainActions()->save();
88+
89+
return ['cms' => $cms];
7690
}
7791
}

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,45 @@
99
<testCase name="Magento\Cms\Test\TestCase\CreateCmsPageEntityTest">
1010
<variation name="CreateCmsPageEntityTestVariation1">
1111
<data name="description" xsi:type="string">MAGETWO-12399: Create CMS Content Page</data>
12-
<data name="cms/data/title" xsi:type="string">NewCmsPage%isolation%</data>
13-
<data name="cms/data/identifier" xsi:type="string">identifier-%isolation%</data>
14-
<data name="cms/data/store_id" xsi:type="string">All Store Views</data>
15-
<data name="cms/data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
12+
<data name="fixtureType" xsi:type="string">cms</data>
13+
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
14+
<data name="data/identifier" xsi:type="string">identifier-%isolation%</data>
15+
<data name="data/store_id" xsi:type="string">All Store Views</data>
16+
<data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
1617
<data name="tag" xsi:type="string">test_type:acceptance_test</data>
1718
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
1819
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
1920
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPagePreview" />
2021
</variation>
2122
<variation name="CreateCmsPageEntityTestVariation2">
2223
<data name="description" xsi:type="string">Create page for default store view</data>
23-
<data name="cms/data/title" xsi:type="string">NewCmsPage%isolation%</data>
24-
<data name="cms/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
25-
<data name="cms/data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
24+
<data name="fixtureType" xsi:type="string">cms</data>
25+
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
26+
<data name="data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
27+
<data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
2628
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
2729
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
2830
</variation>
2931
<variation name="CreateCmsPageEntityTestVariation3">
3032
<data name="description" xsi:type="string">Create page with widget and system variable</data>
31-
<data name="cms/data/title" xsi:type="string">NewCmsPage%isolation%</data>
32-
<data name="cms/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
33-
<data name="cms/data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
34-
<data name="cms/data/content/widget/preset" xsi:type="string">default</data>
35-
<data name="cms/data/content/variable" xsi:type="string">General Contact Name</data>
33+
<data name="fixtureType" xsi:type="string">cms</data>
34+
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
35+
<data name="data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
36+
<data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
37+
<data name="data/content/widget/preset" xsi:type="string">default</data>
38+
<data name="data/content/variable" xsi:type="string">General Contact Name</data>
3639
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
3740
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
3841
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
3942
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPagePreview" />
4043
</variation>
4144
<variation name="CreateCmsPageEntityTestVariation4">
4245
<data name="description" xsi:type="string">Create disabled page</data>
43-
<data name="cms/data/title" xsi:type="string">NewCmsPage%isolation%</data>
44-
<data name="cms/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
45-
<data name="cms/data/is_active" xsi:type="string">Disabled</data>
46-
<data name="cms/data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
46+
<data name="fixtureType" xsi:type="string">cms</data>
47+
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
48+
<data name="data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
49+
<data name="data/is_active" xsi:type="string">Disabled</data>
50+
<data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
4751
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
4852
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
4953
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />

0 commit comments

Comments
 (0)