Skip to content

Commit 910fc17

Browse files
jilu1jilu1
committed
Merge branch 'MC-1752' into RE-develop
2 parents 65d6a4a + d0f5dec commit 910fc17

File tree

6 files changed

+76
-0
lines changed

6 files changed

+76
-0
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminMessagesSection">
1212
<element name="success" type="text" selector="#messages div.message-success"/>
13+
<element name="nthSuccess" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
1314
</section>
1415
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,4 +319,39 @@
319319
<data key="name" unique="suffix">Api Simple Product</data>
320320
<data key="price">100.00</data>
321321
</entity>
322+
<entity name="ApiSimplePrice10Qty10" type="product">
323+
<data key="sku" unique="suffix">api-simple-product</data>
324+
<data key="type_id">simple</data>
325+
<data key="attribute_set_id">4</data>
326+
<data key="visibility">4</data>
327+
<data key="name" unique="suffix">Api Simple Product</data>
328+
<data key="price">10.00</data>
329+
<data key="urlKey" unique="suffix">api-simple-product</data>
330+
<data key="status">1</data>
331+
<requiredEntity type="product_extension_attribute">EavStock10</requiredEntity>
332+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
333+
</entity>
334+
<entity name="ApiSimplePrice100Qty100" type="product">
335+
<data key="sku" unique="suffix">api-simple-product</data>
336+
<data key="type_id">simple</data>
337+
<data key="attribute_set_id">4</data>
338+
<data key="visibility">4</data>
339+
<data key="name" unique="suffix">Api Simple Product</data>
340+
<data key="price">100.00</data>
341+
<data key="urlKey" unique="suffix">api-simple-product</data>
342+
<data key="status">1</data>
343+
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
344+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
345+
</entity>
346+
<entity name="ApiSimplePrice100Qty100v2" type="product">
347+
<data key="sku" unique="suffix">api-simple-product</data>
348+
<data key="type_id">simple</data>
349+
<data key="attribute_set_id">4</data>
350+
<data key="visibility">4</data>
351+
<data key="name" unique="suffix">Api Simple Product</data>
352+
<data key="price">100.00</data>
353+
<data key="urlKey" unique="suffix">api-simple-product</data>
354+
<data key="status">1</data>
355+
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
356+
</entity>
322357
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductExtensionAttributeData.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@
1111
<entity name="EavStockItem" type="product_extension_attribute">
1212
<requiredEntity type="stock_item">Qty_1000</requiredEntity>
1313
</entity>
14+
<entity name="EavStock100" type="product_extension_attribute">
15+
<requiredEntity type="stock_item">Qty_100</requiredEntity>
16+
</entity>
17+
<entity name="EavStock10" type="product_extension_attribute">
18+
<requiredEntity type="stock_item">Qty_10</requiredEntity>
19+
</entity>
1420
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StockItemData.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,20 @@
1212
<data key="qty">1000</data>
1313
<data key="is_in_stock">true</data>
1414
</entity>
15+
<entity name="Qty_100" type="stock_item">
16+
<data key="qty">100</data>
17+
<data key="is_in_stock">true</data>
18+
</entity>
19+
<entity name="Qty_10" type="stock_item">
20+
<data key="qty">10</data>
21+
<data key="is_in_stock">true</data>
22+
</entity>
23+
<entity name="Qty_99" type="stock_item">
24+
<data key="qty">99</data>
25+
<data key="is_in_stock">true</data>
26+
</entity>
27+
<entity name="Qty_101" type="stock_item">
28+
<data key="qty">101</data>
29+
<data key="is_in_stock">true</data>
30+
</entity>
1531
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@
2424
<element name="productLinkByHref" type="text" selector="a.product-item-link[href$='{{var1}}.html']" parameterized="true"/>
2525
<element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
2626
<element name="categoryImage" type="text" selector=".category-image"/>
27+
<element name="emptyProductMessage" type="block" selector=".message.info.empty>div"/>
28+
<element name="lineProductName" type="text" selector=".products.list.items.product-items li:nth-of-type({{line}}) .product-item-link" timeout="30" parameterized="true"/>
2729
</section>
2830
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryTopToolbarSection.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="StorefrontCategoryTopToolbarSection">
12+
<element name="gridMode" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='mode-grid']" timeout="30"/>
13+
<element name="listMode" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='mode-list']" timeout="30"/>
14+
<element name="sortByDropdown" type="select" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='sorter']" timeout="30"/>
15+
</section>
16+
</sections>

0 commit comments

Comments
 (0)