Skip to content

Commit 877d99c

Browse files
glo74186glo74186
committed
MQE-3311 : changes are done
1 parent 22f29fe commit 877d99c

8 files changed

+96
-193
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddDataInCatalogStoreFrontDetailsActionGroup.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminPreDefineDataInCatalogStoreFrontActionGroup.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminVerifiesListAndGridModeActionGroup.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
<seeElement selector="{{AdminChecksListAndGridModeSection.listView}}" stepKey="seePageInListView"/>
2222
<scrollTo selector="{{AdminChecksListAndGridModeSection.gridMode}}" stepKey="scrollToGridMode"/>
2323
<click selector="{{AdminChecksListAndGridModeSection.gridMode}}" stepKey="clickGridMode"/>
24-
<waitForPageLoad stepKey="waitForGridMode"/>
25-
<seeElement selector="{{AdminChecksListAndGridModeSection.gridView}}" stepKey="seePageInGridView"/>
24+
<waitForPageLoad stepKey="waitForGridMode"/>
25+
<seeElement selector="{{AdminChecksListAndGridModeSection.listView}}" stepKey="seePageInGridView"/>
2626
<click selector="{{AdminChecksListAndGridModeSection.listView}}" stepKey="clickListMode"/>
2727
<waitForPageLoad stepKey="waitForListMode"/>
2828
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="1" stepKey="seeNumberOfProductsInPage1"/>
2929
<click selector="{{AdminChecksListAndGridModeSection.productsPerPage}}" stepKey="clickProductsPerPageButtonInListMode"/>
3030
<waitForPageLoad stepKey="waitForProductsPerPage"/>
3131
<click selector="{{AdminChecksListAndGridModeSection.allButton}}" stepKey="selectAllButton"/>
3232
<waitForPageLoad stepKey="waitForSelectAll"/>
33-
<seeElement selector="{{AdminChecksListAndGridModeSection.allProducts}}" stepKey="seeAllProducts"/>
33+
<seeElement selector="{{AdminChecksListAndGridModeSection.allProducts}}" stepKey="seeAllProducts"/>
3434
<click selector="{{AdminChecksListAndGridModeSection.gridMode}}" stepKey="switchToGridMode"/>
35-
<seeElement selector="{{AdminChecksListAndGridModeSection.gridView}}" stepKey="seePageInGridView2"/>
35+
<seeElement selector="{{AdminChecksListAndGridModeSection.gridView}}" stepKey="seePageInGridView2"/>
3636
<click selector="{{StorefrontCategoryProductSection.categoryListView}}" stepKey="switchToListMode1"/>
37-
<seeElement selector="{{AdminChecksListAndGridModeSection.listView}}" stepKey="seePageInListView1"/>
37+
<seeElement selector="{{AdminChecksListAndGridModeSection.listView}}" stepKey="seePageInListView1"/>
3838
<click selector="{{AdminChecksListAndGridModeSection.gridMode}}" stepKey="switchToGridMode1"/>
3939
<click selector="{{AdminChecksListAndGridModeSection.productsPerPage}}" stepKey="clickProductsPerPageButtonInGridMode"/>
4040
<waitForPageLoad stepKey="waitForProductsPerPageOpen"/>
41-
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions1}}" stepKey="seePageOptions1"/>
42-
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions2}}" stepKey="seePageOptions2"/>
43-
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions3}}" stepKey="seePageOptions3"/>
44-
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions4}}" stepKey="seePageOptions4"/>
45-
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions5}}" stepKey="seePageOptions5"/>
41+
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions('1')}}" stepKey="seePageOptions1"/>
42+
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions('2')}}" stepKey="seePageOptions2"/>
43+
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions('3')}}" stepKey="seePageOptions3"/>
44+
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions('4')}}" stepKey="seePageOptions4"/>
45+
<seeElement selector="{{AdminChecksListAndGridModeSection.pageOptions('5')}}" stepKey="seePageOptions5"/>
4646

4747

4848

‎app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,52 @@
7777
<data key="path">catalog/frontend/grid_per_page</data>
7878
<data key="value">1</data>
7979
</entity>
80+
<entity name="CustomListMode">
81+
<data key="path">catalog/frontend/list_mode</data>
82+
<data key="value">list-grid</data>
83+
</entity>
84+
<entity name="CustomStoreFrontGridPerPageValuesConfigData">
85+
<data key="path">catalog/frontend/grid_per_page_values</data>
86+
<data key="value">1,10,50,100</data>
87+
</entity>
88+
<entity name="CustomStoreFrontGridPerPageConfigData">
89+
<data key="path">catalog/frontend/grid_per_page</data>
90+
<data key="value">10</data>
91+
</entity>
92+
<entity name="CustomStoreFrontListPerPageValuesConfigData">
93+
<data key="path">catalog/frontend/list_per_page_values</data>
94+
<data key="value">1,10,30</data>
95+
</entity>
96+
<entity name="CustomStoreFrontListPerPageConfigData">
97+
<data key="path">catalog/frontend/list_per_page</data>
98+
<data key="value">1</data>
99+
</entity>
100+
<entity name="CustomStoreFrontProductsSortBy">
101+
<data key="path">catalog/frontend/default_sort_by</data>
102+
<data key="value">price</data>
103+
</entity>
104+
<entity name="CustomStoreFrontAllProductsPerPage">
105+
<data key="path">catalog/frontend/list_allow_all</data>
106+
<data key="value">1</data>
107+
</entity>
108+
<entity name="DefaultListMode">
109+
<data key="path">catalog/frontend/list_mode</data>
110+
<data key="value">grid-list</data>
111+
</entity>
112+
<entity name="DefaultStoreFrontListPerPageValuesConfigData">
113+
<data key="path">catalog/frontend/list_per_page_values</data>
114+
<data key="value">5,10,15,20,25</data>
115+
</entity>
116+
<entity name="DefaultStoreFrontListPerPageConfigData">
117+
<data key="path">catalog/frontend/list_per_page</data>
118+
<data key="value">10</data>
119+
</entity>
120+
<entity name="DefaultStoreFrontProductsSortBy">
121+
<data key="path">catalog/frontend/default_sort_by</data>
122+
<data key="value">position</data>
123+
</entity>
124+
<entity name="DefaultStoreFrontAllProductsPerPage">
125+
<data key="path">catalog/frontend/list_allow_all</data>
126+
<data key="value">0</data>
127+
</entity>
80128
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCatalogStorefrontConfigSection.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,8 @@
1111
<section name="AdminCatalogStorefrontConfigSection">
1212

1313
<element name="sectionHeader" type="button" selector="#catalog_frontend-head"/>
14-
<element name="listMode" type="button" selector='//*[@id="catalog_frontend_list_mode"]'/>
15-
<element name="gridList" type="button" selector='//option[@value="grid-list"]'/>
1614
<element name="productsPerPageAllowedValues" type="input" selector="#catalog_frontend_grid_per_page_values"/>
1715
<element name="productsPerPageDefaultValue" type="input" selector="#catalog_frontend_grid_per_page"/>
18-
<element name="productsPerPageListAllowedValues" type="input" selector='//*[@id="catalog_frontend_list_per_page_values"]'/>
19-
<element name="productsPerPageListDefaultValue" type="input" selector='//*[@id="catalog_frontend_list_per_page"]'/>
20-
<element name="productsListingSort" type="button" selector='//*[@id="catalog_frontend_default_sort_by"]'/>
21-
<element name="positionProduct" type="button" selector='//option[@value="position"]'/>
22-
<element name="productsPerPage" type="button" selector='//*[@id="catalog_frontend_list_allow_all"]'/>
23-
<element name="selectProductsPerPage" type="button" selector='//option[@value="0"]'/>
2416
</section>
2517
</sections>
2618

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminChangesInCatalogStorefrontConfigSection.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminChecksListAndGridModeSection.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919
<element name="productsPerPage" type="button" selector='//*[@class="field limiter"]//*[@id="limiter"]'/>
2020
<element name="allButton" type="button" selector='//*[@id="limiter"]/option[4]'/>
2121
<element name="allProducts" type="text" selector='//ol[@class="products list items product-items"]'/>
22-
<element name="pageOptions1" type="text" selector='//*[@id="limiter"]/option'/>
23-
<element name="pageOptions2" type="text" selector='//*[@id="limiter"]/option[2]'/>
24-
<element name="pageOptions3" type="text" selector='//*[@id="limiter"]/option[3]'/>
25-
<element name="pageOptions4" type="text" selector='//*[@id="limiter"]/option[4]'/>
26-
<element name="pageOptions5" type="text" selector='//*[@id="limiter"]/option[5]'/>
22+
<element name="pageOptions" type="text" selector='//*[@id="limiter"]/option[{{var1}}]' parameterized="true"/>
2723
<element name="productCount" type="text" selector='//span[@class="product-image-wrapper"]'/>
2824

2925

0 commit comments

Comments
 (0)