Skip to content

Commit 53be34b

Browse files
o-dubovyko-dubovyk
committed
Merge remote-tracking branches 'local/ACP2E-1073', 'local/ACP2E-1120' and 'local/ACP2E-1323' into PR_1_NOV_2022
4 parents bb1c882 + fb368e8 + abb10ec + f9b8e1b commit 53be34b

File tree

12 files changed

+356
-11
lines changed

12 files changed

+356
-11
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminToggleProductGridColumnByClickingItsNameActionGroup.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="AdminToggleProductGridColumnByClickingItsNameActionGroup">
12+
<annotations>
13+
<description>Click on 'Columns' name from Columns dropdown menu in Admin Product Grid.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="optionName" type="string" defaultValue="Name"/>
17+
</arguments>
18+
<click selector="{{AdminProductGridFilterSection.viewColumnOptionName(optionName)}}" stepKey="clickOnTheColumnName"/>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<element name="inputByCodeRangeFrom" type="input" selector="input.admin__control-text[name='{{code}}[from]']" parameterized="true"/>
4040
<element name="inputByCodeRangeTo" type="input" selector="input.admin__control-text[name='{{code}}[to]']" parameterized="true"/>
4141
<element name="storeViewOptions" type="text" selector=".admin__data-grid-outer-wrap select[name='store_id'] > option[value='{{value}}']" parameterized="true"/>
42+
<element name="viewColumnOptionName" type="text" selector="//div[contains(@class, '_active')]//div[contains(@class, 'admin__data-grid-action-columns-menu')]//div[@class='admin__field-option']//label[text()='{{col}}']" parameterized="true"/>
4243
<element name="customAttribute" type="text" selector="input.admin__control-text[name='{{var}}']" parameterized="true"/>
4344
</section>
4445
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridCustomViewColumnDisplayTest.xml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
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="AdminProductGridCustomViewColumnDisplayTest">
12+
<annotations>
13+
<stories value="Product grid columns visibility can be toggled by clicking on their names in the Columns drop-down menu, not just on their respective checkboxes."/>
14+
<title value="Product grid columns visibility can be toggled by clicking on their names in the Columns drop-down menu, not just on their respective checkboxes."/>
15+
<description value="Assert that after rearranging columns order on the product grid in Admin, it will still be possible to toggle the visibility of the columns by clicking on their names in the Columns dropdown menu, and not only on their respective checkboxes."/>
16+
<severity value="AVERAGE"/>
17+
<testCaseId value="AC-6229"/>
18+
<useCaseId value="ACP2E-1073"/>
19+
<group value="catalog"/>
20+
</annotations>
21+
<before>
22+
<!-- Log in as admin -->
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
</before>
25+
<after>
26+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
27+
<actionGroup ref="AdminLogoutActionGroup" stepKey="beginWithLogout"/>
28+
</after>
29+
<!-- Navigate to products list page -->
30+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
31+
<!-- Sort SKU and Name column position -->
32+
<dragAndDrop selector1="{{AdminProductGridSection.columnHeader('SKU')}}" selector2="{{AdminProductGridSection.columnHeader('Name')}}" stepKey="dragAndDropColumnName"/>
33+
<!-- Check if price column is visible in grid -->
34+
<seeElement selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="seeProductPriceColumn"/>
35+
<!-- Click on columns, in dropdown uncheck price -->
36+
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="openColumnsDropdownMenuToTogglePrice"/>
37+
<actionGroup ref="AdminToggleProductGridColumnByClickingItsNameActionGroup" stepKey="hidePriceColumn">
38+
<argument name="optionName" value="Price"/>
39+
</actionGroup>
40+
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="closeColumnsDropdownMenuAfterTogglePrice"/>
41+
<!-- Price column is not visible in product grid -->
42+
<dontSeeElement selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="dontSeeProductPriceColumn"/>
43+
<!-- Check weight column is not visible in product grid -->
44+
<dontSeeElement selector="{{AdminProductGridSection.columnHeader('Weight')}}" stepKey="dontSeeWeightColumn"/>
45+
<!-- Click on columns, in dropdown click on column name weight -->
46+
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="openColumnsDropdownMenuToToggleWeight"/>
47+
<actionGroup ref="AdminToggleProductGridColumnByClickingItsNameActionGroup" stepKey="showWeightColumn">
48+
<argument name="optionName" value="Weight"/>
49+
</actionGroup>
50+
<actionGroup ref="ToggleAdminProductGridColumnsDropdownActionGroup" stepKey="closeColumnsDropdownMenuAfterToggleWeight"/>
51+
<seeElement selector="{{AdminProductGridSection.columnHeader('Weight')}}" stepKey="seeWeightColumn"/>
52+
</test>
53+
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
<test name="AdminCheckZeroSubtotalOrderIsInProcessingStatusTest">
1212
<annotations>
1313
<features value="Checkout"/>
14-
<stories value="MAGETWO-71375: Zero Subtotal Orders have incorrect status"/>
14+
<stories value="Zero Subtotal Orders have incorrect status"/>
1515
<title value="Zero Subtotal Orders should have the 'Processing' status on creating"/>
1616
<description value="Created order should be in Processing status"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-94178"/>
19+
<useCaseId value="MAGETWO-71375"/>
1920
<group value="checkout"/>
2021
</annotations>
2122
<before>
@@ -37,7 +38,6 @@
3738
</createData>
3839

3940
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
40-
4141
</before>
4242

4343
<after>

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

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
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="AdminCheckZeroSubtotalOrderWithCustomStatus">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Zero Subtotal Checkout Order"/>
15+
<title value="Zero Subtotal Checkout Order must have the new order status set in configuration." />
16+
<description value="Order placed with Zero Subtotal Checkout payment must have the new order status set in configuration."/>
17+
<testCaseId value="AC-6723"/>
18+
<useCaseId value="ACP2E-1120"/>
19+
<severity value="AVERAGE"/>
20+
<group value="checkout"/>
21+
</annotations>
22+
<before>
23+
<createData entity="SimpleSubCategory" stepKey="simplecategory"/>
24+
<createData entity="SimpleProduct" stepKey="simpleproduct">
25+
<requiredEntity createDataKey="simplecategory"/>
26+
</createData>
27+
<createData entity="PaymentMethodsSettingConfig" stepKey="paymentMethodsSettingConfig"/>
28+
<createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
29+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
30+
<argument name="tags" value="config full_page"/>
31+
</actionGroup>
32+
33+
<createData entity="ApiSalesRule" stepKey="createCartPriceRule">
34+
<field key="discount_amount">100</field>
35+
</createData>
36+
<createData entity="ApiSalesRuleCoupon" stepKey="createCartPriceRuleCoupon">
37+
<requiredEntity createDataKey="createCartPriceRule"/>
38+
</createData>
39+
40+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
41+
</before>
42+
43+
<after>
44+
<deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
45+
<deleteData createDataKey="simpleproduct" stepKey="deleteProduct"/>
46+
<createData entity="DisablePaymentMethodsSettingConfig" stepKey="disablePaymentMethodsSettingConfig"/>
47+
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
48+
<createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
49+
<deleteData createDataKey="createCartPriceRule" stepKey="deleteSalesRule"/>
50+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
51+
<argument name="indices" value=""/>
52+
</actionGroup>
53+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
54+
<argument name="tags" value="config full_page"/>
55+
</actionGroup>
56+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
57+
</after>
58+
59+
<!-- Go to new order status page -->
60+
<actionGroup ref="AdminGoToOrderStatusPageActionGroup" stepKey="goToOrderStatusPage"/>
61+
<actionGroup ref="AdminClickCreateNewStatusButtonOnOrderStatusPageActionGroup" stepKey="clickCreateNewStatus"/>
62+
63+
<!-- Fill the form and validate message -->
64+
<actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
65+
<argument name="status" value="{{EnableFreeOrderStatusCustom.value}}"/>
66+
<argument name="label" value="{{EnableFreeOrderStatusCustom.label}}"/>
67+
</actionGroup>
68+
<actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
69+
70+
<!-- Verify the order status grid page shows the order status we just created -->
71+
<actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="searchCreatedOrderStatus">
72+
<argument name="status" value="{{EnableFreeOrderStatusCustom.value}}"/>
73+
<argument name="label" value="{{EnableFreeOrderStatusCustom.label}}"/>
74+
</actionGroup>
75+
76+
<!-- Assign status to state -->
77+
<click selector="{{AdminOrderStatusGridSection.assignStatusToStateBtn}}" stepKey="clickAssignStatusBtn"/>
78+
<selectOption selector="{{AdminAssignOrderStatusToStateSection.orderStatus}}" userInput="{{EnableFreeOrderStatusCustom.value}}" stepKey="selectOrderStatus"/>
79+
<selectOption selector="{{AdminAssignOrderStatusToStateSection.orderState}}" userInput="{{OrderState.new}}" stepKey="selectOrderState"/>
80+
<checkOption selector="{{AdminAssignOrderStatusToStateSection.orderStatusAsDefault}}" stepKey="orderStatusAsDefault"/>
81+
<uncheckOption selector="{{AdminAssignOrderStatusToStateSection.visibleOnStorefront}}" stepKey="visibleOnStorefront"/>
82+
<click selector="{{AdminAssignOrderStatusToStateSection.saveStatusAssignment}}" stepKey="clickSaveStatus"/>
83+
<see selector="{{AdminMessagesSection.success}}" userInput="You assigned the order status." stepKey="seeSuccess"/>
84+
85+
<!-- Prepare data for constraints -->
86+
<magentoCLI command="config:set {{EnableFreeOrderStatusCustom.path}} {{EnableFreeOrderStatusCustom.value}}" stepKey="enableNewOrderStatus"/>
87+
<magentoCLI command="config:set {{EnableFreeOrderPaymentAction.path}} {{EnableFreeOrderPaymentAction.value}}" stepKey="enableNewOrderPaymentAction"/>
88+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
89+
<argument name="tags" value="config full_page"/>
90+
</actionGroup>
91+
92+
<!-- Add product to cart and place order -->
93+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="AddProductToCard">
94+
<argument name="product" value="$$simpleproduct$$"/>
95+
</actionGroup>
96+
97+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="clickToProceedToCheckout"/>
98+
99+
<actionGroup ref="ShipmentFormFreeShippingActionGroup" stepKey="shipmentFormFreeShippingActionGroup"/>
100+
101+
<actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyDiscountCoupon">
102+
<argument name="discountCode" value="$createCartPriceRuleCoupon.code$"/>
103+
</actionGroup>
104+
105+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
106+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
107+
108+
<!-- Go to admin and check order status -->
109+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToSalesOrderPage"/>
110+
<actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchForOrder">
111+
<argument name="keyword" value="{$grabOrderNumber}"/>
112+
</actionGroup>
113+
114+
<actionGroup ref="AdminCheckOrderStatusInGridActionGroup" stepKey="seeOrderStatusInGrid">
115+
<argument name="orderId" value="$grabOrderNumber"/>
116+
<argument name="status" value="{{EnableFreeOrderStatusCustom.label}}"/>
117+
</actionGroup>
118+
119+
<!-- Open order -->
120+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
121+
<argument name="orderId" value="{$grabOrderNumber}"/>
122+
</actionGroup>
123+
124+
<!-- Assert invoice button -->
125+
<seeElement selector="{{AdminOrderDetailsMainActionsSection.invoiceBtn}}" stepKey="seeInvoiceBtn"/>
126+
127+
</test>
128+
</tests>

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

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
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="AdminCheckZeroSubtotalOrderWithGeneratedInvoiceTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Zero Subtotal Checkout Order"/>
15+
<title value="Zero Subtotal Order should have invoice generated when setting 'Automatically Invoice All Items' to Yes." />
16+
<description value="Created order with automatically invoice generated."/>
17+
<severity value="AVERAGE"/>
18+
<testCaseId value="AC-6722"/>
19+
<useCaseId value="ENGCOM-5443"/>
20+
<group value="checkout"/>
21+
</annotations>
22+
<before>
23+
<createData entity="SimpleSubCategory" stepKey="simplecategory"/>
24+
<createData entity="SimpleProduct" stepKey="simpleproduct">
25+
<requiredEntity createDataKey="simplecategory"/>
26+
</createData>
27+
<createData entity="PaymentMethodsSettingConfig" stepKey="paymentMethodsSettingConfig"/>
28+
<createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
29+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
30+
<argument name="tags" value="config full_page"/>
31+
</actionGroup>
32+
33+
<createData entity="ApiSalesRule" stepKey="createCartPriceRule">
34+
<field key="discount_amount">100</field>
35+
</createData>
36+
<createData entity="ApiSalesRuleCoupon" stepKey="createCartPriceRuleCoupon">
37+
<requiredEntity createDataKey="createCartPriceRule"/>
38+
</createData>
39+
40+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
41+
42+
</before>
43+
44+
<after>
45+
<deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
46+
<deleteData createDataKey="simpleproduct" stepKey="deleteProduct"/>
47+
<createData entity="DisablePaymentMethodsSettingConfig" stepKey="disablePaymentMethodsSettingConfig"/>
48+
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
49+
<createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
50+
<deleteData createDataKey="createCartPriceRule" stepKey="deleteSalesRule"/>
51+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
52+
<argument name="indices" value=""/>
53+
</actionGroup>
54+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
55+
<argument name="tags" value="config full_page"/>
56+
</actionGroup>
57+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
58+
</after>
59+
60+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="AddProductToCard">
61+
<argument name="product" value="$$simpleproduct$$"/>
62+
</actionGroup>
63+
64+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="clickToProceedToCheckout"/>
65+
66+
<actionGroup ref="ShipmentFormFreeShippingActionGroup" stepKey="shipmentFormFreeShippingActionGroup"/>
67+
68+
<actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyDiscountCoupon">
69+
<argument name="discountCode" value="$createCartPriceRuleCoupon.code$"/>
70+
</actionGroup>
71+
72+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
73+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
74+
75+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToSalesOrderPage"/>
76+
<actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchForOrder">
77+
<argument name="keyword" value="{$grabOrderNumber}"/>
78+
</actionGroup>
79+
80+
<actionGroup ref="AdminCheckOrderStatusInGridActionGroup" stepKey="seeOrderStatusInGrid">
81+
<argument name="orderId" value="$grabOrderNumber"/>
82+
<argument name="status" value="Processing"/>
83+
</actionGroup>
84+
85+
<!-- Assert invoice in invoices grid -->
86+
<actionGroup ref="FilterInvoiceGridByOrderIdWithCleanFiltersActionGroup" stepKey="filterInvoiceGridByOrderId">
87+
<argument name="orderId" value="$grabOrderNumber"/>
88+
</actionGroup>
89+
<click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="opeCreatedInvoice"/>
90+
<waitForPageLoad stepKey="waitForInvoiceDetailsPageToLoad"/>
91+
<grabFromCurrentUrl regex="~/invoice_id/(\d+)/~" stepKey="grabInvoiceId"/>
92+
93+
</test>
94+
</tests>

‎app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public function render(\Magento\Framework\DataObject $row)
2424

2525
$actions[] = [
2626
'url' => $this->getUrl('adminhtml/*/preview', ['id' => $row->getId()]),
27-
'popup' => true,
2827
'caption' => __('Preview'),
28+
'target' => '_blank'
2929
];
3030

3131
$this->getColumn()->setActions($actions);

0 commit comments

Comments
 (0)