Skip to content

Commit fd8db61

Browse files
mykhailomatiolamykhailomatiola
committed
Merge branch 'MC-30809' into 2.3-develop-com-pr13
2 parents 2c6dec2 + 90dc4b7 commit fd8db61

File tree

34 files changed

+1270
-155
lines changed

34 files changed

+1270
-155
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@
1616
<entity name="prodNameWithSpecChars">
1717
<data key="trademark">"Pursuit Lumaflex™ Tone Band"</data>
1818
<data key="skumark">"x™"</data>
19+
<data key="trademark_without_quotes">Pursuit Lumaflex™ Tone Band</data>
20+
<data key="skumark_without_quotes">x™</data>
1921
</entity>
2022
</entities>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
<element name="sectionHeader" type="button" selector="div[data-index='assign_products']" timeout="30"/>
1313
<element name="addProducts" type="button" selector="#catalog_category_add_product_tabs" timeout="30"/>
1414
<element name="addProductsDisabled" type="button" selector="#catalog_category_add_product_tabs[disabled]" timeout="30"/>
15+
<element name="productsInCategorySectionTitle" type="text" selector="div[data-index='assign_products'] .fieldset-wrapper-title" timeout="10"/>
16+
<element name="productsInCategorySectionBody" type="text" selector="div[data-index='assign_products'] .admin__fieldset-wrapper-content"/>
1517
</section>
16-
</sections>
18+
</sections>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,14 +606,14 @@
606606
<test name="QuickSearchConfigurableChildren">
607607
<annotations>
608608
<stories value="Search Product on Storefront"/>
609-
<title value="User should be able to use Quick Search to a configurable product's child products"/>
609+
<title value="Deprecated. User should be able to use Quick Search to a configurable product's child products"/>
610610
<description value="Use Quick Search to find a configurable product with enabled/disable children"/>
611611
<severity value="MAJOR"/>
612612
<testCaseId value="MC-14798"/>
613613
<group value="CatalogSearch"/>
614614
<group value="mtf_migrated"/>
615615
<skip>
616-
<issueId value="MC-15101"/>
616+
<issueId value="DEPRECATED">Use StorefrontQuickSearchConfigurableChildrenTest instead.</issueId>
617617
</skip>
618618
</annotations>
619619
<before>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
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="StorefrontQuickSearchConfigurableChildrenTest">
12+
<annotations>
13+
<stories value="Search Product on Storefront"/>
14+
<title value="User should be able to use Quick Search to a configurable product's child products"/>
15+
<description value="Use Quick Search to find a configurable product with enabled/disable children"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="MC-14798"/>
18+
<group value="CatalogSearch"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<before>
22+
<!-- Create the category -->
23+
<createData entity="ApiCategory" stepKey="createCategory"/>
24+
<!-- Create blank AttributeSet-->
25+
<createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
26+
<!-- Create an attribute with two options to be used in the first child product -->
27+
<createData entity="hiddenDropdownAttributeWithOptions" stepKey="createProductAttribute"/>
28+
<createData entity="productAttributeOption1" stepKey="createProductAttributeOption">
29+
<requiredEntity createDataKey="createProductAttribute"/>
30+
</createData>
31+
32+
<!-- Assign attribute to set -->
33+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
34+
<actionGroup ref="goToAttributeGridPage" stepKey="goToAttributeSetPage"/>
35+
<actionGroup ref="goToAttributeSetByName" stepKey="openAttributeSetByName">
36+
<argument name="name" value="$createAttributeSet.attribute_set_name$"/>
37+
</actionGroup>
38+
<actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
39+
<argument name="group" value="Product Details"/>
40+
<argument name="attribute" value="$createProductAttribute.attribute_code$"/>
41+
</actionGroup>
42+
<actionGroup ref="SaveAttributeSet" stepKey="savePage"/>
43+
44+
<!-- Get the first option of the attribute we created -->
45+
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption">
46+
<requiredEntity createDataKey="createProductAttribute"/>
47+
</getData>
48+
49+
<!-- Create a simple product -->
50+
<createData entity="ApiSimpleOneHidden" storeCode="all" stepKey="createSimpleProduct">
51+
<field key="attribute_set_id">$createAttributeSet.attribute_set_id$</field>
52+
<requiredEntity createDataKey="createProductAttribute"/>
53+
<requiredEntity createDataKey="getAttributeOption"/>
54+
</createData>
55+
<updateData entity="ApiSimpleProductUpdateDescription" createDataKey="createSimpleProduct" stepKey="updateSimpleProduct"/>
56+
57+
<!-- Create the configurable product -->
58+
<createData entity="ApiConfigurableProduct" stepKey="createConfigurableProduct">
59+
<field key="attribute_set_id">$createAttributeSet.attribute_set_id$</field>
60+
<requiredEntity createDataKey="createCategory"/>
61+
</createData>
62+
<!-- Create the configurable product option -->
63+
<createData entity="ConfigurableProductOneOption" stepKey="createConfigProductOption">
64+
<requiredEntity createDataKey="createConfigurableProduct"/>
65+
<requiredEntity createDataKey="createProductAttribute"/>
66+
<requiredEntity createDataKey="getAttributeOption"/>
67+
</createData>
68+
<!-- Add the first simple product to the configurable product -->
69+
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
70+
<requiredEntity createDataKey="createConfigurableProduct"/>
71+
<requiredEntity createDataKey="createSimpleProduct"/>
72+
</createData>
73+
74+
<!-- Perform reindex -->
75+
<!-- TODO: remove after MC-29942 delivered-->
76+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
77+
</before>
78+
<after>
79+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
80+
<deleteData createDataKey="createConfigurableProduct" stepKey="deleteConfigurableProduct"/>
81+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
82+
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
83+
<deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
84+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
85+
</after>
86+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
87+
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
88+
<argument name="phrase" value="$createConfigurableProduct.name$"/>
89+
</actionGroup>
90+
<actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="seeProductInGrid">
91+
<argument name="productName" value="$createConfigurableProduct.name$"/>
92+
<argument name="index" value="1"/>
93+
</actionGroup>
94+
95+
<!-- Disable Child Product -->
96+
<actionGroup ref="goToProductPageViaID" stepKey="openSimpleProduct">
97+
<argument name="productId" value="$createSimpleProduct.id$"/>
98+
</actionGroup>
99+
<actionGroup ref="toggleProductEnabled" stepKey="disableProduct"/>
100+
<actionGroup ref="saveProductForm" stepKey="saveProduct"/>
101+
102+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePageAgain"/>
103+
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefrontAgain">
104+
<argument name="phrase" value="$createConfigurableProduct.name$"/>
105+
</actionGroup>
106+
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="dontSeeProductAnymore">
107+
<argument name="productName" value="$createConfigurableProduct.name$"/>
108+
</actionGroup>
109+
</test>
110+
</tests>

‎app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/GenerateCategoryProductUrlRewriteConfigData.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<entity name="EnableGenerateCategoryProductUrlRewritesConfigData">
12+
<!-- Default value -->
13+
<data key="path">catalog/seo/generate_category_product_rewrites</data>
14+
<data key="label">Yes</data>
15+
<data key="value">1</data>
16+
</entity>
17+
<entity name="DisableGenerateCategoryProductUrlRewritesConfigData">
18+
<data key="path">catalog/seo/generate_category_product_rewrites</data>
19+
<data key="label">No</data>
20+
<data key="value">0</data>
21+
</entity>
22+
</entities>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutProcessTest.xml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
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="StorefrontCustomerCheckoutProcessTest">
12+
<annotations>
13+
<features value="Customer Checkout"/>
14+
<stories value="Checkout via Storefront"/>
15+
<title value="Customer Checkout via Storefront"/>
16+
<description value="Should be able to place an order as a customer."/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-30406"/>
19+
<group value="checkout"/>
20+
</annotations>
21+
<before>
22+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
23+
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
24+
<requiredEntity createDataKey="createCategory"/>
25+
</createData>
26+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
27+
<!-- TODO: remove after MC-29942 delivered-->
28+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
29+
</before>
30+
<after>
31+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
32+
<deleteData createDataKey="createCategory" stepKey="deleteSimpleCategory"/>
33+
<deleteData createDataKey="createCustomer" stepKey="deleteUsCustomer"/>
34+
<actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="resetCustomerFilters"/>
35+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
36+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
37+
</after>
38+
39+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomerLogin">
40+
<argument name="Customer" value="$$createCustomer$$"/>
41+
</actionGroup>
42+
43+
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage">
44+
<argument name="category" value="$$createCategory$$"/>
45+
</actionGroup>
46+
47+
<waitForPageLoad stepKey="waitForCatalogPageLoad"/>
48+
49+
<actionGroup ref="StorefrontAddCategoryProductToCartActionGroup" stepKey="addProductToCart">
50+
<argument name="product" value="$$createSimpleProduct$$"/>
51+
<argument name="productCount" value="CONST.one"/>
52+
</actionGroup>
53+
54+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
55+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
56+
<actionGroup ref="StorefrontCheckoutForwardFromShippingStep" stepKey="goToReview"/>
57+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
58+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder">
59+
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
60+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
61+
</actionGroup>
62+
63+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="orderNumber"/>
64+
65+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
66+
67+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="addFilterToGridAndOpenOrder">
68+
<argument name="orderId" value="{$orderNumber}"/>
69+
</actionGroup>
70+
71+
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="verifyOrderStatus"/>
72+
<see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Customer" stepKey="verifyAccountInformation"/>
73+
<see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="$$createCustomer.email$$" stepKey="verifyCustomerEmail"/>
74+
<see selector="{{AdminOrderDetailsInformationSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" stepKey="verifyBillingAddress"/>
75+
<see selector="{{AdminOrderDetailsInformationSection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}}" stepKey="verifyShippingAddress"/>
76+
<see selector="{{AdminOrderDetailsInformationSection.itemsOrdered}}" userInput="$$createSimpleProduct.name$$" stepKey="verifyProductName"/>
77+
78+
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openCustomerEditPage">
79+
<argument name="customer" value="$$createCustomer$$"/>
80+
</actionGroup>
81+
82+
<click selector="{{AdminEditCustomerInformationSection.orders}}" stepKey="navigateToOrdersTab"/>
83+
<waitForElementVisible selector="{{AdminEditCustomerOrdersSection.orderGrid}}" stepKey="waitForOrdersGridVisible"/>
84+
<see selector="{{AdminEditCustomerOrdersSection.orderGrid}}" userInput="$$createCustomer.firstname$$ $$createCustomer.lastname$$" stepKey="verifyOrder"/>
85+
</test>
86+
</tests>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
<annotations>
1313
<features value="Checkout"/>
1414
<stories value="Checkout via the Admin"/>
15-
<title value="Customer Checkout via the Admin"/>
15+
<title value="DEPRECATED Customer Checkout via the Admin"/>
1616
<description value="Should be able to place an order as a customer."/>
1717
<severity value="CRITICAL"/>
18+
<skip>
19+
<issueId value="DEPRECATED">Use StorefrontCustomerCheckoutProcessTest instead</issueId>
20+
</skip>
1821
<testCaseId value="MC-5922"/>
1922
<group value="checkout"/>
2023
</annotations>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenCreditMemoFromOrderPageActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminOpenCreditMemoFromOrderPageActionGroup">
12+
<annotations>
13+
<description>Admin open creditmemo from order</description>
14+
</annotations>
15+
<conditionalClick selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" dependentSelector="{{AdminOrderCreditMemosTabSection.viewGridRow('1')}}" visible="false" stepKey="openCreditMemosTab"/>
16+
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.viewMemo}}" stepKey="waitForCreditMemosTabOpened"/>
17+
<click selector="{{AdminOrderCreditMemosTabSection.viewGridRow('1')}}" stepKey="viewMemo"/>
18+
<waitForPageLoad stepKey="waitForCreditMemoOpened"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenInvoiceFromOrderPageActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminOpenInvoiceFromOrderPageActionGroup">
12+
<annotations>
13+
<description>Admin open invoice from order</description>
14+
</annotations>
15+
<conditionalClick selector="{{AdminOrderDetailsOrderViewSection.invoices}}" dependentSelector="{{AdminOrderInvoicesTabSection.viewInvoice}}" visible="false" stepKey="openInvoicesTab"/>
16+
<waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvocesTabOpened"/>
17+
<click selector="{{AdminOrderInvoicesTabSection.viewGridRow('1')}}" stepKey="viewInvoice"/>
18+
<waitForPageLoad stepKey="waitForInvoiceOpened"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenShipmentFromOrderPageActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminOpenShipmentFromOrderPageActionGroup">
12+
<annotations>
13+
<description>Admin open shipment from order</description>
14+
</annotations>
15+
<conditionalClick selector="{{AdminOrderDetailsOrderViewSection.shipments}}" dependentSelector="{{AdminOrderShipmentsTabSection.viewShipment}}" visible="false" stepKey="openShipmentsTab"/>
16+
<waitForElementVisible selector="{{AdminOrderShipmentsTabSection.viewShipment}}" stepKey="waitForShipmentTabOpened"/>
17+
<click selector="{{AdminOrderShipmentsTabSection.viewGridRow('1')}}" stepKey="viewShipment"/>
18+
<waitForPageLoad stepKey="waitForShipmentOpened"/>
19+
</actionGroup>
20+
</actionGroups>

0 commit comments

Comments
 (0)