Skip to content

Commit 713f5c7

Browse files
dhaeckerdhaecker
committed
Merge branch 'B2B-1653' into foxes-pr
2 parents 108f730 + 39aae47 commit 713f5c7

11 files changed

+547
-0
lines changed

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportGroupedProductTest.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminAwsS3ImportGroupedProductTest" extends="AdminImportGroupedProductTest">
12+
<annotations>
13+
<features value="AwsS3"/>
14+
<stories value="Import Products"/>
15+
<title value="S3 - Import Grouped Product"/>
16+
<description value="Imports a .csv file containing a grouped product. Verifies that product is imported
17+
successfully and can be purchased."/>
18+
<severity value="MAJOR"/>
19+
<group value="importExport"/>
20+
<group value="GroupedProduct"/>
21+
<group value="remote_storage_aws_s3"/>
22+
<skip>
23+
<issueId value="MC-39280"/>
24+
</skip>
25+
</annotations>
26+
<before>
27+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="createImportCategory"/>
28+
</before>
29+
<after>
30+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logoutFromAdmin"/>
31+
</after>
32+
</test>
33+
</tests>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerOrderProductRowDataActionGroup.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontVerifyCustomerOrderProductRowDataActionGroup">
12+
<annotations>
13+
<description>Verify a customer's order details for a product row on the view order page on the storefront</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="name" type="string"/>
17+
<argument name="sku" type="string"/>
18+
<argument name="price" type="string"/>
19+
<argument name="quantity" type="string"/>
20+
<argument name="subtotal" type="string"/>
21+
<argument name="index" defaultValue="1" type="string"/>
22+
</arguments>
23+
<waitForText userInput="{{name}}" selector="{{StorefrontCustomerOrderViewSection.productNameByRow(index)}}" stepKey="seeProductName"/>
24+
<waitForText userInput="{{sku}}" selector="{{StorefrontCustomerOrderViewSection.productSkuByRow(index)}}" stepKey="seeProductSku"/>
25+
<waitForText userInput="{{price}}" selector="{{StorefrontCustomerOrderViewSection.productPriceByRow(index)}}" stepKey="seeProductPrice"/>
26+
<waitForText userInput="{{quantity}}" selector="{{StorefrontCustomerOrderViewSection.productQuantityByRow(index)}}" stepKey="seeProductQuantity"/>
27+
<waitForText userInput="{{subtotal}}" selector="{{StorefrontCustomerOrderViewSection.productSubtotalByRow(index)}}" stepKey="seeProductSubtotal"/>
28+
</actionGroup>
29+
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
<element name="createdDate" type="text" selector=".block-order-details-comments .comment-date"/>
2222
<element name="orderPlacedBy" type="text" selector=".block-order-details-comments .comment-content"/>
2323
<element name="productName" type="text" selector="//td[@data-th='Product Name']"/>
24+
<element name="productNameByRow" type="text" parameterized="true" selector="#my-orders-table tbody:nth-of-type({{index}}) td.name"/>
25+
<element name="productSkuByRow" type="text" parameterized="true" selector="#my-orders-table tbody:nth-of-type({{index}}) td.sku"/>
26+
<element name="productPriceByRow" type="text" parameterized="true" selector="#my-orders-table tbody:nth-of-type({{index}}) td.price"/>
27+
<element name="productQuantityByRow" type="text" parameterized="true" selector="#my-orders-table tbody:nth-of-type({{index}}) td.qty"/>
28+
<element name="productSubtotalByRow" type="text" parameterized="true" selector="#my-orders-table tbody:nth-of-type({{index}}) td.subtotal"/>
2429
<element name="grandTotal" type="text" selector="//tr[@class='grand_total']//td[@data-th='Grand Total']"/>
2530
</section>
2631
</sections>

‎app/code/Magento/GroupedImportExport/Test/Mftf/ActionGroup/AdminAssertGroupedProductInfoOnEditPageActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminAssertGroupedProductGeneralInfoOnEditPageActionGroup" extends="AdminAssertProductInfoOnEditPageActionGroup">
12+
<annotations>
13+
<description>Verifies the general data on the Edit product details page in admin for a grouped product.</description>
14+
</annotations>
15+
<remove keyForRemoval="seeProductPrice"/>
16+
<remove keyForRemoval="seeProductWeight"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/GroupedImportExport/Test/Mftf/Data/ImportData.xml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- Categories -->
12+
<entity name="ImportCategory_Grouped" type="category">
13+
<data key="name">import-category-grouped</data>
14+
<data key="name_lwr">import-category-grouped</data>
15+
<data key="is_active">true</data>
16+
<data key="include_in_menu">true</data>
17+
<data key="urlKey">import-category-grouped</data>
18+
</entity>
19+
20+
<!-- Products -->
21+
<entity name="ImportProductSimple1_Grouped" type="product">
22+
<data key="name">import-product-simple1-grouped</data>
23+
<data key="sku">import-product-simple1-grouped</data>
24+
<data key="type_id">simple</data>
25+
<data key="attribute_set_id">4</data>
26+
<data key="attributeSetText">Default</data>
27+
<data key="price">11.00</data>
28+
<data key="visibility">4</data>
29+
<data key="status">1</data>
30+
<data key="statusText">Enabled</data>
31+
<data key="quantity">101</data>
32+
<data key="groupedDefaultQuantity">3</data>
33+
<data key="groupedPosition">1</data>
34+
<data key="urlKey">import-product-simple1-grouped</data>
35+
<data key="weight">1</data>
36+
<data key="thumbnailImage">/m/a/magento-logo</data>
37+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
38+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
39+
</entity>
40+
<entity name="ImportProductSimple2_Grouped" type="product">
41+
<data key="name">import-product-simple2-grouped</data>
42+
<data key="sku">import-product-simple2-grouped</data>
43+
<data key="type_id">simple</data>
44+
<data key="attribute_set_id">4</data>
45+
<data key="attributeSetText">Default</data>
46+
<data key="price">12.00</data>
47+
<data key="visibility">4</data>
48+
<data key="status">1</data>
49+
<data key="statusText">Enabled</data>
50+
<data key="quantity">102</data>
51+
<data key="groupedDefaultQuantity">2</data>
52+
<data key="groupedPosition">0</data>
53+
<data key="urlKey">import-product-simple2-grouped</data>
54+
<data key="weight">2</data>
55+
<data key="thumbnailImage">/t/e/test_image</data>
56+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
57+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
58+
</entity>
59+
<entity name="ImportProductSimple3_Grouped" type="product">
60+
<data key="name">import-product-simple3-grouped</data>
61+
<data key="sku">import-product-simple3-grouped</data>
62+
<data key="type_id">simple</data>
63+
<data key="attribute_set_id">4</data>
64+
<data key="attributeSetText">Default</data>
65+
<data key="price">13.00</data>
66+
<data key="visibility">4</data>
67+
<data key="status">1</data>
68+
<data key="statusText">Enabled</data>
69+
<data key="quantity">103</data>
70+
<data key="groupedDefaultQuantity">1</data>
71+
<data key="groupedPosition">2</data>
72+
<data key="urlKey">import-product-simple3-grouped</data>
73+
<data key="weight">3</data>
74+
<data key="thumbnailImage">/a/d/adobe-base</data>
75+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
76+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
77+
</entity>
78+
<entity name="ImportProduct_Grouped" type="product">
79+
<data key="fileName">import_grouped_product.csv</data>
80+
<data key="importSummary">Created: 4, Updated: 0, Deleted: 0</data>
81+
<data key="name">import-product-grouped</data>
82+
<data key="sku">import-product-grouped</data>
83+
<data key="type_id">grouped</data>
84+
<data key="attribute_set_id">4</data>
85+
<data key="price"/>
86+
<data key="visibility">4</data>
87+
<data key="status">1</data>
88+
<data key="quantity">0</data>
89+
<data key="weight">1</data>
90+
<data key="urlKey">import-product-grouped</data>
91+
</entity>
92+
</entities>

0 commit comments

Comments
 (0)