Skip to content

Commit 5c6306d

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-64243' into 2.1.8-develop-pr11
2 parents b7e059f + c83c720 commit 5c6306d

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/GridSortingTest.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@
1010
<variation name="CmsPagesGridSorting">
1111
<data name="tag" xsi:type="string">to_maintain:yes</data>
1212
<data name="description" xsi:type="string">Verify cms page grid sorting</data>
13+
<data name="itemsCount" xsi:type="string">2</data>
14+
<data name="fixtureName" xsi:type="string">cmsPage</data>
15+
<data name="fixtureDataSet" xsi:type="string">default</data>
16+
<data name="steps" xsi:type="array">
17+
<item name="0" xsi:type="string">-</item>
18+
<item name="1" xsi:type="string">-</item>
19+
</data>
1320
<data name="columnsForSorting" xsi:type="array">
1421
<item name="id" xsi:type="string">ID</item>
15-
<item name="date" xsi:type="string">Created</item>
22+
<item name="identifier" xsi:type="string">URL Key</item>
1623
</data>
1724
<data name="pageClass" xsi:type="string">Magento\Cms\Test\Page\Adminhtml\CmsPageIndex</data>
1825
<data name="gridRetriever" xsi:type="string">getCmsPageGridBlock</data>
@@ -29,7 +36,7 @@
2936
<data name="fixtureDataSet" xsi:type="string">default</data>
3037
<data name="columnsForSorting" xsi:type="array">
3138
<item name="id" xsi:type="string">ID</item>
32-
<item name="date" xsi:type="string">Created</item>
39+
<item name="identifier" xsi:type="string">Identifier</item>
3340
</data>
3441
<data name="pageClass" xsi:type="string">Magento\Cms\Test\Page\Adminhtml\CmsBlockIndex</data>
3542
<data name="gridRetriever" xsi:type="string">getCmsBlockGrid</data>

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/GridSortingTest.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,17 @@
1010
<variation name="CustomerGridSorting">
1111
<data name="tag" xsi:type="string">to_maintain:yes</data>
1212
<data name="description" xsi:type="string">Verify customer page grid sorting</data>
13+
<data name="itemsCount" xsi:type="string">2</data>
14+
<data name="fixtureName" xsi:type="string">customer</data>
15+
<data name="fixtureDataSet" xsi:type="string">default</data>
1316
<data name="columnsForSorting" xsi:type="array">
1417
<item name="id" xsi:type="string">ID</item>
1518
<item name="date" xsi:type="string">Customer Since</item>
1619
</data>
20+
<data name="steps" xsi:type="array">
21+
<item name="0" xsi:type="string">-</item>
22+
<item name="1" xsi:type="string">-</item>
23+
</data>
1724
<data name="pageClass" xsi:type="string">Magento\Customer\Test\Page\Adminhtml\CustomerIndex</data>
1825
<data name="gridRetriever" xsi:type="string">getCustomerGridBlock</data>
1926
<constraint name="Magento\Ui\Test\Constraint\AssertGridSorting"/>

0 commit comments

Comments
 (0)