Skip to content

Commit 38e916b

Browse files
ishakhsuvarovishakhsuvarov
authored
Merge branch '2.4-develop' into 2.4-develop-prs
2 parents 6766a8e + 04388dd commit 38e916b

14 files changed

+420
-1
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/CustomerReorderSimpleProductTest.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="CustomerReorderSimpleProductTest" extends="CustomerOrderSimpleProductTest">
11+
<annotations>
12+
<features value="Checkout"/>
13+
<stories value="Customer Reorder simple product"/>
14+
<title value="Customer Reorder simple product"/>
15+
<description value="Customer Reorder simple product"/>
16+
<stories value="Customer Reorder simple product"/>
17+
<testCaseId value="MC-27191"/>
18+
<severity value="MAJOR"/>
19+
<group value="reorder"/>
20+
</annotations>
21+
22+
<!-- Log in as admin-->
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
25+
<!-- Go to orders page and validate the order details -->
26+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="addFilterToGridAndOpenOrder">
27+
<argument name="orderId" value="{$getOrderNumber}"/>
28+
</actionGroup>
29+
30+
<!-- create an shipment for the order-->
31+
<actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createNewShipment">
32+
<argument name="Title" value="Title"/>
33+
<argument name="Number" value="99"/>
34+
<argument name="Qty" value="1"/>
35+
<argument name="Comment" value="comments for shipment"/>
36+
</actionGroup>
37+
38+
39+
<!-- Open My Account Page from Customer dropdown -->
40+
<actionGroup ref="StorefrontOpenMyAccountPageActionGroup" stepKey="goToMyAccountPage"/>
41+
42+
<!-- Goto Orders tab from Sidebar menu in Storefront page -->
43+
<actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToSidebarMenu">
44+
<argument name="menu" value="My Orders"/>
45+
</actionGroup>
46+
47+
<!-- Clicking View Order from My Orders Grid -->
48+
<actionGroup ref="StorefrontClickViewOrderLinkOnMyOrdersPageActionGroup" stepKey="clickViewOrder"/>
49+
50+
51+
<!-- Clicking on Reorder link from Order Details Tab -->
52+
<click selector="{{StorefrontCustomerOrderViewSection.reorder}}" stepKey="clickReorder"/>
53+
54+
<!-- Reorder Simple Product -->
55+
<actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeReorder">
56+
<argument name="shippingMethod" value="Flat Rate"/>
57+
</actionGroup>
58+
59+
</test>
60+
</tests>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,20 @@
2222
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
2323
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
2424
</entity>
25+
<entity name="SimpleProductQty100" type="product">
26+
<data key="name" unique="suffix">testProductName</data>
27+
<data key="sku" unique="suffix">testSku</data>
28+
<data key="urlKey" unique="suffix">testproductname</data>
29+
<data key="type_id">simple</data>
30+
<data key="attribute_set_id">4</data>
31+
<data key="visibility">4</data>
32+
<data key="price">123.00</data>
33+
<data key="status">1</data>
34+
<data key="quantity">100</data>
35+
<data key="weight">1</data>
36+
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
37+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
38+
</entity>
2539
<entity name="ApiSimpleProduct" type="product">
2640
<data key="name" unique="suffix">Api Simple Product</data>
2741
<data key="sku" unique="suffix">api-simple-product</data>

‎app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/AdminCreateCreditMemoWithReturnToStockActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminCreateCreditMemoWithReturnToStockActionGroup">
11+
<annotations>
12+
<description>Create shipment with 'return to stock'. Starts on order page.</description>
13+
</annotations>
14+
<click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreditMemoAction"/>
15+
<click selector="{{AdminCreditMemoItemsSection.itemReturnToStock('1')}}" stepKey="returnToStockCheckbox"/>
16+
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="waitButtonEnabled"/>
17+
<click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickSubmitCreditMemo"/>
18+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
19+
<see selector="{{AdminMessagesSection.success}}" userInput="You created the credit memo." stepKey="seeCreditMemoCreateSuccess"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventoryConfigData.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,14 @@
3333
<data key="label">No</data>
3434
<data key="value">0</data>
3535
</entity>
36+
<entity name="CatalogInventoryManageStockAutoReturnEnable">
37+
<!-- Magento default value -->
38+
<data key="path">cataloginventory/item_options/auto_return</data>
39+
<data key="value">1</data>
40+
</entity>
41+
<entity name="CatalogInventoryManageStockAutoReturnDisable">
42+
<!-- Magento default value -->
43+
<data key="path">cataloginventory/item_options/auto_return</data>
44+
<data key="value">0</data>
45+
</entity>
3646
</entities>

‎app/code/Magento/CatalogInventory/Test/Mftf/Test/AdminUncheckesReturnToStockCheckboxTest.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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="AdminUncheckesReturnToStockCheckboxTest" extends="CustomerOrderSimpleProductTest">
12+
<annotations>
13+
<features value="CatalogInventory"/>
14+
<stories value="Sales restrictions"/>
15+
<title value="Verify that Checkbox return to stock on creditmemo"/>
16+
<description value="Verify that Checkbox return to stock on creditmemo"/>
17+
<severity value="MAJOR"/>
18+
<useCaseId value="MC-27229"/>
19+
<testCaseId value="MC-27229"/>
20+
<group value="catalog"/>
21+
<group value="catalogInventory"/>
22+
</annotations>
23+
<before>
24+
<!-- Enabling Automatically Return Credit Memo Item to Stock -->
25+
<magentoCLI command="config:set {{CatalogInventoryManageStockAutoReturnEnable.path}} {{CatalogInventoryManageStockAutoReturnEnable.value}}" stepKey="manageStockEnable"/>
26+
</before>
27+
<after>
28+
<!-- Disabling Automatically Return Credit Memo Item to Stock -->
29+
<magentoCLI command="config:set {{CatalogInventoryManageStockAutoReturnDisable.path}} {{CatalogInventoryManageStockAutoReturnDisable.value}}" stepKey="manageStockDisable"/>
30+
</after>
31+
<!-- Log in as admin-->
32+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
33+
<!-- go to orders page and validate the order details -->
34+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="addFilterToGridAndOpenOrder">
35+
<argument name="orderId" value="{$getOrderNumber}"/>
36+
</actionGroup>
37+
38+
<!--Create Invoice-->
39+
<actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
40+
41+
<!--Create Credit Memo-->
42+
<actionGroup ref="AdminCreateCreditMemoWithReturnToStockActionGroup" stepKey="createCreditMemo"/>
43+
44+
45+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
46+
<conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
47+
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchForProduct">
48+
<argument name="product" value="SimpleProductQty100"/>
49+
</actionGroup>
50+
51+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeQuantity">
52+
<argument name="row" value="1"/>
53+
<argument name="column" value="Quantity"/>
54+
<argument name="value" value="99"/>
55+
</actionGroup>
56+
57+
<click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
58+
</test>
59+
</tests>
60+

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="CustomerOrderSimpleProductTest">
11+
<annotations>
12+
<features value="Checkout"/>
13+
<stories value="Customer Order Simple Product"/>
14+
<title value="Customer Order Simple Product"/>
15+
<description value="Customer Order Simple Product"/>
16+
<stories value="Customer Checkoqut"/>
17+
<severity value="MAJOR"/>
18+
<group value="checkout"/>
19+
<group value="shoppingCart"/>
20+
</annotations>
21+
<before>
22+
23+
<!-- create category -->
24+
<createData entity="_defaultCategory" stepKey="testCategory"/>
25+
<!-- create data -->
26+
<createData entity="SimpleProductQty100" stepKey="testProduct">
27+
<requiredEntity createDataKey="testCategory"/>
28+
</createData>
29+
<!-- Assign Product to Category -->
30+
<createData entity="AssignProductToCategory" stepKey="assignTestCategoryToTestProduct">
31+
<requiredEntity createDataKey="testCategory"/>
32+
<requiredEntity createDataKey="testProduct"/>
33+
</createData>
34+
<!-- create customer -->
35+
<createData entity="CustomerEntityOne" stepKey="createCustomer"/>
36+
</before>
37+
38+
<after>
39+
<!-- delete category,product,customer -->
40+
<deleteData createDataKey="testProduct" stepKey="deleteSimpleProduct"/>
41+
<deleteData createDataKey="testCategory" stepKey="deleteSimpleCategory"/>
42+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
43+
</after>
44+
<!-- Login as customer -->
45+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomerLogin">
46+
<argument name="Customer" value="$$createCustomer$$"/>
47+
</actionGroup>
48+
49+
<!-- Customer placed order from storefront with payment method -->
50+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
51+
<argument name="product" value="$testProduct$"/>
52+
</actionGroup>
53+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
54+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodFlatRate"/>
55+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToCheckoutPaymentStep"/>
56+
57+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder">
58+
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
59+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
60+
</actionGroup>
61+
62+
<!-- order number is captured for future validation -->
63+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="getOrderNumber"/>
64+
</test>
65+
</tests>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminAssertCustomerIsSubscribedToNewslettersUncheckedActionGroup">
11+
<annotations>
12+
<description>Verify that check box "Newsletter subscribed" is unchecked on "Newsletter" tab on customer edit page.</description>
13+
</annotations>
14+
<click selector="{{AdminEditCustomerNewsletterSection.subscribeToNewsletterAgain}}" stepKey="subscribeToNewsletterAgain"/>
15+
<waitForPageLoad stepKey="waitForPageLoad"/>
16+
<seeElement selector="{{AdminEditCustomerNewsletterSection.checkboxIsVisibility}}" stepKey="checkboxIsVisibility"/>
17+
18+
</actionGroup>
19+
</actionGroups>
20+
21+

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
<element name="subscribedStatus" type="checkbox" selector="//div[@class='admin__field-control control']//input[@name='subscription_status[{{websiteId}}]']" parameterized="true"/>
1313
<element name="subscribedStore" type="select" selector="//div[@class='admin__field-control control']//select[@name='subscription_store[{{websiteId}}]']" parameterized="true"/>
1414
<element name="subscribedLastUpdatedDate" type="text" selector="//div[@class='admin__field-control control']//div[@class='field-change_status_date_{{websiteId}}']//div[@class='control-value']" parameterized="true"/>
15+
<element name="checkboxIsVisbale" type="checkbox" selector="//input[@id='_newslettersubscription_status_1' and @value='1']"/>
16+
<element name="subscribeToNewsletterAgain" type="text" selector="//a[@class='admin__page-nav-link' and @id='tab_newsletter_content']"/>
17+
<element name="checkboxIsVisibility" type="checkbox" selector="//input[@id='_newslettersubscription_status_1' and @value='']"/>
1518
</section>
16-
</sections>
19+
</sections>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerSubscribeToNewsletterAndVerifyInAdminTest.xml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StorefrontCustomerSubscribeToNewsletterAndVerifyInAdminTest">
11+
<annotations>
12+
<features value="Newsletter Subscription Checkbox Verify"/>
13+
<stories value="Subscribe To Newsletter Subscription on StoreFront And Verify In Admin"/>
14+
<title value="StoreFront Customer Newsletter Subscription And Verify In Admin"/>
15+
<description value="Customer can be subscribed to Newsletter Subscription on StoreFront And Verify In Admin"/>
16+
<group value="module-customer"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-27411"/>
19+
</annotations>
20+
<before>
21+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
22+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
23+
<argument name="Customer" value="$$createCustomer$$"/>
24+
</actionGroup>
25+
</before>
26+
<after>
27+
<deleteData createDataKey="createCustomer" stepKey="deleteCreatedCustomer"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
29+
</after>
30+
<!-- Check the newsletter checkbox -->
31+
<actionGroup ref="StorefrontCustomerNavigateToNewsletterPageActionGroup" stepKey="navigateToNewsletterPage"/>
32+
<actionGroup ref="StorefrontCustomerUpdateGeneralSubscriptionActionGroup" stepKey="subscribeToNewsletter"/>
33+
<actionGroup ref="AssertStorefrontCustomerMessagesActionGroup" stepKey="assertMessage">
34+
<argument name="message" value="We have saved your subscription."/>
35+
</actionGroup>
36+
<!--login in admin-->
37+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
38+
<!--Open Customer Page -->
39+
<actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomerPage"/>
40+
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
41+
<argument name="customer" value="$createCustomer$"/>
42+
</actionGroup>
43+
<actionGroup ref="AdminAssertCustomerIsSubscribedToNewsletters" stepKey="adminSubscribeToNewsletter"/>
44+
<seeElement selector="{{AdminEditCustomerNewsletterSection.checkboxIsVisbale}}" stepKey="checkboxIsVisbale"/>
45+
<seeCheckboxIsChecked selector="{{AdminEditCustomerNewsletterSection.checkboxIsVisbale}}" stepKey="checkBoxIsChecked"/>
46+
<!--Uncheck the newsletter checkbox -->
47+
<actionGroup ref="StorefrontCustomerNavigateToNewsletterPageActionGroup" stepKey="navigateToNewsletterPageAgain"/>
48+
<actionGroup ref="StorefrontCustomerUpdateGeneralSubscriptionActionGroup" stepKey="subscribeToNewsletterPage"/>
49+
<actionGroup ref="AssertStorefrontCustomerMessagesActionGroup" stepKey="assertMessages">
50+
<argument name="message" value="We have removed your newsletter subscription."/>
51+
</actionGroup>
52+
<!--Open Customer Page -->
53+
<actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomerPageAgain"/>
54+
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPageAgain">
55+
<argument name="customer" value="$createCustomer$"/>
56+
</actionGroup>
57+
<!-- Open Newseltter tab header-->
58+
<actionGroup ref="AdminAssertCustomerIsSubscribedToNewslettersUncheckedActionGroup" stepKey="subscribeToNewsletterAgain"/>
59+
<dontSeeCheckboxIsChecked selector="{{AdminEditCustomerNewsletterSection.checkboxIsVisibility}}" stepKey="checkBoxIsUnchecked"/>
60+
</test>
61+
</tests>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="AdminResetColumnDropDownActionGroup">
12+
<annotations>
13+
<description>Reset the column dropdown ot its original state on the Orders grid page.</description>
14+
</annotations>
15+
<!-- Resetting column checkbox -->
16+
<click selector="{{AdminOrdersGridSection.columnsDropdown}}" stepKey="openColumnsDropdown"/>
17+
<click selector="{{AdminOrdersGridSection.resetColumnCheckbox}}" stepKey="resetColumnCheckbox"/>
18+
<click selector="{{AdminOrdersGridSection.columnsDropdown}}" stepKey="closeColumnsDropdown" />
19+
</actionGroup>
20+
</actionGroups>
21+

0 commit comments

Comments
 (0)