Skip to content

Commit 3c3c8ed

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes
Accepted Community Pull Requests: - #30222: [MFTF] Create AdminOpenCartPriceRulesPageActionGroup (by @Usik2203) - #28809: Add Imagick CMYK to SRGB conversion (by @tdgroot) - #27940: Avoid exception when config.xml nodes exist for not-installed payment methods (by @fredden) - #28385: [Fixed] - resolve issue with filter visibility with column visibility in grid (by @niravkrish) Fixed GitHub Issues: - #22375: CMYK images are rendered with inverted colors (reported by @ioweb-gr) has been fixed in #28809 by @tdgroot in 2.4-develop branch Related commits: 1. 5fd9733 2. 4d801c5 3. 5015928 4. 2cc29b7 5. 16962dd 6. a4bfb72 7. 82565e8 8. 9efd600 9. 8b251e4 10. efb7354 11. 4cc567d - #29555: [Issue] Avoid exception when config.xml nodes exist for not-installed payment methods (reported by @m2-assistant[bot]) has been fixed in #27940 by @fredden in 2.4-develop branch Related commits: 1. 158582a 2. 2ce2116 3. fbd618c 4. 38dbccf 5. c7658e3 6. dfcb7b1 7. eb80bd8 - #30345: [Issue] [Fixed] - resolve issue with filter visibility with column visibility in grid (reported by @m2-assistant[bot]) has been fixed in #28385 by @niravkrish in 2.4-develop branch Related commits: 1. 0a0c8e4 2. 2f0a4d8 3. 8e4cf84 4. d887e8e 5. 9b2f7ec
2 parents 8b1d118 + 667e5b5 commit 3c3c8ed

File tree

45 files changed

+192
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+192
-86
lines changed

‎app/code/Magento/Bundle/view/adminhtml/ui_component/bundle_product_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<label translate="true">Status</label>
5959
<dataScope>status</dataScope>
6060
<imports>
61-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
61+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
6262
</imports>
6363
</settings>
6464
</filterSelect>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@
133133
<waitForPageLoad stepKey="waitForFiltersClear"/>
134134

135135
<!--Create Cart Price Rule-->
136-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
137-
<waitForPageLoad stepKey="waitForPriceList"/>
136+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
138137
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
139138
<waitForPageLoad stepKey="waitForPageDiscountPageIsLoaded"/>
140139
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="ship" stepKey="fillRuleName"/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
<deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
4242
</after>
4343

44-
<!--Open MARKETING > Cart Price Rules-->
45-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
46-
<waitForPageLoad stepKey="waitForRulesPage"/>
44+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
4745

4846
<!--Add New Rule-->
4947
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<label translate="true">Store View</label>
6565
<dataScope>store_id</dataScope>
6666
<imports>
67-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
67+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
6868
</imports>
6969
</settings>
7070
</filterSelect>

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<label translate="true">Store View</label>
7070
<dataScope>store_id</dataScope>
7171
<imports>
72-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
72+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
7373
</imports>
7474
</settings>
7575
</filterSelect>

‎app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<label translate="true">Status</label>
5959
<dataScope>status</dataScope>
6060
<imports>
61-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
61+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
6262
</imports>
6363
</settings>
6464
</filterSelect>

‎app/code/Magento/GroupedProduct/view/adminhtml/ui_component/grouped_product_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<label translate="true">Status</label>
5959
<dataScope>status</dataScope>
6060
<imports>
61-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
61+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
6262
</imports>
6363
</settings>
6464
</filterSelect>

‎app/code/Magento/Payment/Model/PaymentMethodList.php

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,57 @@
66
namespace Magento\Payment\Model;
77

88
use Magento\Payment\Api\Data\PaymentMethodInterface;
9+
use Magento\Payment\Api\Data\PaymentMethodInterfaceFactory;
10+
use Magento\Payment\Api\PaymentMethodListInterface;
11+
use Magento\Payment\Helper\Data;
12+
use UnexpectedValueException;
913

10-
/**
11-
* Payment method list class.
12-
*/
13-
class PaymentMethodList implements \Magento\Payment\Api\PaymentMethodListInterface
14+
class PaymentMethodList implements PaymentMethodListInterface
1415
{
1516
/**
16-
* @var \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory
17+
* @var PaymentMethodInterfaceFactory
1718
*/
1819
private $methodFactory;
1920

2021
/**
21-
* @var \Magento\Payment\Helper\Data
22+
* @var Data
2223
*/
2324
private $helper;
2425

2526
/**
26-
* @param \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory $methodFactory
27-
* @param \Magento\Payment\Helper\Data $helper
27+
* @param PaymentMethodInterfaceFactory $methodFactory
28+
* @param Data $helper
2829
*/
2930
public function __construct(
30-
\Magento\Payment\Api\Data\PaymentMethodInterfaceFactory $methodFactory,
31-
\Magento\Payment\Helper\Data $helper
31+
PaymentMethodInterfaceFactory $methodFactory,
32+
Data $helper
3233
) {
3334
$this->methodFactory = $methodFactory;
3435
$this->helper = $helper;
3536
}
3637

3738
/**
38-
* {@inheritdoc}
39+
* @inheritDoc
3940
*/
4041
public function getList($storeId)
4142
{
4243
$methodsCodes = array_keys($this->helper->getPaymentMethods());
43-
4444
$methodsInstances = array_map(
4545
function ($code) {
46-
return $this->helper->getMethodInstance($code);
46+
try {
47+
return $this->helper->getMethodInstance($code);
48+
} catch (UnexpectedValueException $e) {
49+
return null;
50+
}
4751
},
4852
$methodsCodes
4953
);
5054

51-
$methodsInstances = array_filter($methodsInstances, function (MethodInterface $method) {
52-
return !($method instanceof \Magento\Payment\Model\Method\Substitution);
55+
$methodsInstances = array_filter($methodsInstances, function ($method) {
56+
return $method && !($method instanceof \Magento\Payment\Model\Method\Substitution);
5357
});
5458

55-
@uasort(
59+
uasort(
5660
$methodsInstances,
5761
function (MethodInterface $a, MethodInterface $b) use ($storeId) {
5862
return (int)$a->getConfigData('sort_order', $storeId) - (int)$b->getConfigData('sort_order', $storeId);
@@ -76,7 +80,7 @@ function (MethodInterface $methodInstance) use ($storeId) {
7680
}
7781

7882
/**
79-
* {@inheritdoc}
83+
* @inheritDoc
8084
*/
8185
public function getActiveList($storeId)
8286
{

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFieldToColumnActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSelectFieldToColumnActionGroup">
12+
<annotations>
13+
<description>Select or clear the checkbox to display the column on the Orders grid page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="column" type="string" defaultValue="Purchase Point"/>
17+
</arguments>
18+
<click selector="{{AdminOrdersGridSection.columnsDropdown}}" stepKey="openColumnsDropdown" />
19+
<click selector="{{AdminOrdersGridSection.viewColumnCheckbox(column)}}" stepKey="disableColumn"/>
20+
<click selector="{{AdminOrdersGridSection.columnsDropdown}}" stepKey="closeColumnsDropdown" />
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<element name="idFilter" type="input" selector=".admin__data-grid-filters input[name='increment_id']"/>
1919
<element name="selectStatus" type="select" selector="select[name='status']" timeout="60"/>
2020
<element name="billToNameFilter" type="input" selector=".admin__data-grid-filters input[name='billing_name']"/>
21+
<element name="purchasePoint" type="select" selector=".admin__data-grid-filters select[name='store_id']"/>
2122
<element name="enabledFilters" type="block" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
2223
<element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
2324
<element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminVerifyFieldToFilterOnOrdersGridTest.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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="AdminVerifyFieldToFilterOnOrdersGridTest">
12+
<annotations>
13+
<features value="Sales"/>
14+
<stories value="Github issue: #28385 Resolve issue with filter visibility with column visibility in grid"/>
15+
<title value="Verify field to filter"/>
16+
<description value="Verify not appear fields to filter on Orders grid if it disables in columns dropdown."/>
17+
<severity value="MAJOR"/>
18+
</annotations>
19+
20+
<before>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin" />
22+
</before>
23+
24+
<after>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout" />
26+
</after>
27+
28+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="goToOrders"/>
29+
<actionGroup ref="AdminSelectFieldToColumnActionGroup" stepKey="unSelectPurchasePoint" />
30+
<click selector="{{AdminOrdersGridSection.filters}}" stepKey="openColumnsDropdown" />
31+
<dontSeeElement selector="{{AdminOrdersGridSection.purchasePoint}}" stepKey="dontSeeElement"/>
32+
33+
<click selector="{{AdminOrdersGridSection.filters}}" stepKey="closeColumnsDropdown" />
34+
<actionGroup ref="AdminSelectFieldToColumnActionGroup" stepKey="selectPurchasePoint" />
35+
<click selector="{{AdminOrdersGridSection.filters}}" stepKey="openColumnsDropdown2" />
36+
<seeElement selector="{{AdminOrdersGridSection.purchasePoint}}" stepKey="seeElement"/>
37+
</test>
38+
</tests>

‎app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
</after>
4040

4141
<!-- Create a cart price rule for $10 Fixed amount discount -->
42-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
43-
<waitForPageLoad stepKey="waitForRulesPage"/>
42+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
4443
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
4544
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ApiSalesRule.name}}" stepKey="fillRuleName"/>
4645
<selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsite"/>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<label translate="true">Purchased From</label>
4343
<dataScope>store_id</dataScope>
4444
<imports>
45-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
45+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
4646
</imports>
4747
</settings>
4848
</filterSelect>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<label translate="true">Purchase Point</label>
5454
<dataScope>store_id</dataScope>
5555
<imports>
56-
<link name="visible">ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible</link>
56+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
5757
</imports>
5858
</settings>
5959
</filterSelect>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_invoice_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<label translate="true">Purchased From</label>
4343
<dataScope>store_id</dataScope>
4444
<imports>
45-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
45+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
4646
</imports>
4747
</settings>
4848
</filterSelect>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_shipment_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<label translate="true">Purchased From</label>
4343
<dataScope>store_id</dataScope>
4444
<imports>
45-
<link name="visible">ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible</link>
45+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
4646
</imports>
4747
</settings>
4848
</filterSelect>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<label translate="true">Purchased From</label>
5252
<dataScope>store_id</dataScope>
5353
<imports>
54-
<link name="visible">ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible</link>
54+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
5555
</imports>
5656
</settings>
5757
</filterSelect>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<label translate="true">Purchased From</label>
5252
<dataScope>store_id</dataScope>
5353
<imports>
54-
<link name="visible">ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible</link>
54+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
5555
</imports>
5656
</settings>
5757
</filterSelect>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<label translate="true">Purchased From</label>
5252
<dataScope>store_id</dataScope>
5353
<imports>
54-
<link name="visible">ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible</link>
54+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
5555
</imports>
5656
</settings>
5757
</filterSelect>

‎app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminOpenCartPriceRulesPageActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminOpenCartPriceRulesPageActionGroup">
12+
<annotations>
13+
<description>Open cart price rules page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="openCartPriceRulesPage"/>
17+
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
</after>
3535

3636
<!-- Create a cart price rule of type Buy X get Y free -->
37-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
38-
<waitForPageLoad stepKey="waitForRulesPage"/>
37+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
3938
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
4039
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
4140
<selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionAndFreeShippingIsAppliedTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
</after>
3232

3333
<!--Create cart price rule as per data and verify AssertCartPriceRuleSuccessSaveMessage-->
34-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
35-
<waitForPageLoad stepKey="waitForPriceList"/>
34+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
3635
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
3736
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.name}}" stepKey="fillRuleName"/>
3837
<fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.description}}" stepKey="fillDescription"/>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionIsNotAppliedTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
</after>
3434

3535
<!--Create cart price rule as per data and verify AssertCartPriceRuleSuccessSaveMessage-->
36-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
37-
<waitForPageLoad stepKey="waitForPriceList"/>
36+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
3837
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
3938
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionNotApplied.name}}" stepKey="fillRuleName"/>
4039
<fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionNotApplied.description}}" stepKey="fillDescription"/>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
<click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig"/>
4848

4949
<!-- Create a cart price rule based on a coupon code -->
50-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
51-
<waitForPageLoad stepKey="waitForPriceList"/>
50+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
5251
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
5352
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
5453
<selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
</after>
3535

3636
<!-- Create a cart price rule based on a coupon code -->
37-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
38-
<waitForPageLoad stepKey="waitForPriceList"/>
37+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
3938
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
4039
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
4140
<selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
</after>
3535

3636
<!-- Create a cart price rule -->
37-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
38-
<waitForPageLoad stepKey="waitForPriceList"/>
37+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
3938
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
4039
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{_defaultCoupon.code}}" stepKey="fillRuleName"/>
4140
<selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForMatchingSubtotalAndVerifyRuleConditionIsAppliedTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
</after>
3232

3333
<!--Create cart price rule as per data and verify AssertCartPriceRuleSuccessSaveMessage-->
34-
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
35-
<waitForPageLoad stepKey="waitForPriceList"/>
34+
<actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
3635
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
3736
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.name}}" stepKey="fillRuleName"/>
3837
<fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{CartPriceRuleConditionAppliedForSubtotal.description}}" stepKey="fillDescription"/>

0 commit comments

Comments
 (0)