Skip to content

Commit 8e07b10

Browse files
okolesnykokolesnyk
committed
MFTF Stability control
 - another round
1 parent c150851 commit 8e07b10

7 files changed

+46
-8
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCheckProductByIdOnProductGridActionGroup.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="AdminCheckProductByIdOnProductGridActionGroup">
12+
<annotations>
13+
<description>Check the checkbox for the product on the Product Grid using Product ID</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="productId" type="string"/>
17+
</arguments>
18+
19+
<waitForElementClickable selector="{{AdminProductGridSection.productRowCheckboxById(productId)}}" stepKey="waitForElementClickable" />
20+
<checkOption selector="{{AdminProductGridSection.productRowCheckboxById(productId)}}" stepKey="selectProduct"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<element name="productRowBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
1212
<element name="productRowByName" type="block" selector="//td[count(../../..//th[./*[.='Name']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
1313
<element name="productRowCheckboxBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]/../td//input[@data-action='select-row']" parameterized="true" />
14+
<element name="productRowCheckboxById" type="block" selector="#idscheck{{id}}" parameterized="true" />
1415
<element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
1516
<element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
1617
<element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
<argument name="keyword" value="api-simple-product"/>
4646
</actionGroup>
4747

48-
<actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="clickCheckbox1">
49-
<argument name="product" value="$$createProductOne$$"/>
48+
<actionGroup ref="AdminCheckProductByIdOnProductGridActionGroup" stepKey="clickCheckbox1">
49+
<argument name="productId" value="$$createProductOne.id$$"/>
5050
</actionGroup>
5151

52-
<actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="clickCheckbox2">
53-
<argument name="product" value="$$createProductTwo$$"/>
52+
<actionGroup ref="AdminCheckProductByIdOnProductGridActionGroup" stepKey="clickCheckbox2">
53+
<argument name="productId" value="$$createProductTwo.id$$"/>
5454
</actionGroup>
5555

5656
<actionGroup ref="AdminClickMassUpdateProductAttributesActionGroup" stepKey="clickDropdown"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
<after>
4343
<magentoCLI command="config:set {{EnableFreeOrderStatusPending.path}} {{EnableFreeOrderStatusPending.value}}" stepKey="disablePaymentMethodsSettingConfig"/>
44+
<magentoCLI command="config:set {{EnableFreeOrderPaymentAutomaticInvoiceAction.path}} {{EnableFreeOrderPaymentAutomaticInvoiceAction.value}}" stepKey="enableFreeOrderPaymentAutomaticInvoiceAction"/>
4445
<actionGroup ref="CliDisableFreeShippingMethodActionGroup" stepKey="disableFreeShippingConfig"/>
4546
<deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
4647
<deleteData createDataKey="simpleproduct" stepKey="deleteProduct"/>
@@ -86,7 +87,7 @@
8687

8788
<!-- Prepare data for constraints -->
8889
<magentoCLI command="config:set {{EnableFreeOrderStatusCustom.path}} {{defaultOrderStatus.status}}" stepKey="enableNewOrderStatus"/>
89-
<comment userInput="Preserve BIC. config:set {{EnableFreeOrderPaymentAction.path}} {{EnableFreeOrderPaymentAction.value}}" stepKey="enableNewOrderPaymentAction"/>
90+
<magentoCLI command="config:set {{DisableFreeOrderPaymentAutomaticInvoiceAction.path}} {{DisableFreeOrderPaymentAutomaticInvoiceAction.value}}" stepKey="enableNewOrderPaymentAction"/>
9091
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
9192
<argument name="tags" value="config full_page"/>
9293
</actionGroup>
@@ -135,10 +136,9 @@
135136
</actionGroup>
136137

137138
<!-- Assert Order Status on Order view page -->
138-
<comment userInput="Preserve BIC. AdminOrderDetailsMainActionsSection.invoiceBtn" stepKey="seeInvoiceBtn"/>
139+
<waitForElementVisible selector="{{AdminOrderDetailsMainActionsSection.invoiceBtn}}" stepKey="seeInvoiceBtn"/>
139140
<actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="verifyOrderStatusOnOrderViewPage">
140141
<argument name="status" value="{{defaultOrderStatus.label}}" />
141142
</actionGroup>
142-
143143
</test>
144144
</tests>

‎app/code/Magento/Sales/Test/Mftf/Data/OrderStatusConfigData.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,16 @@
3535
<data key="scope_id">1</data>
3636
<data key="value">0</data>
3737
</entity>
38+
<entity name="DisableFreeOrderPaymentAutomaticInvoiceAction">
39+
<data key="path">payment/free/payment_action</data>
40+
<data key="scope">default</data>
41+
<data key="scope_id">1</data>
42+
<data key="value">0</data>
43+
</entity>
44+
<entity name="EnableFreeOrderPaymentAutomaticInvoiceAction">
45+
<data key="path">payment/free/payment_action</data>
46+
<data key="scope">default</data>
47+
<data key="scope_id">1</data>
48+
<data key="value">1</data>
49+
</entity>
3850
</entities>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@
5959
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
6060
<grabTextFrom selector="{{OrdersGridSection.orderID}}" stepKey="orderNumber"/>
6161
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToSalesOrderPage1"/>
62-
<click selector="{{AdminOrdersGridSection.allCheckbox}}" stepKey="clickSelectAll"/>
62+
<scrollToTopOfPage stepKey="scrollToTop" />
63+
<waitForElementClickable selector="{{AdminOrdersGridSection.allCheckbox}}" stepKey="waitForSelectAllClickable" />
64+
<checkOption selector="{{AdminOrdersGridSection.allCheckbox}}" stepKey="clickSelectAll"/>
6365
<openNewTab stepKey="openNewTab"/>
6466
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage">
6567
<argument name="productUrl" value="$createProduct.custom_attributes[url_key]$"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
<waitForElementVisible time="30" selector="{{CheckoutCartSummarySection.estimateShippingAndTaxForm}}" stepKey="waitForEstimateShippingAndTaxForm"/>
112112
<waitForElementVisible time="30" selector="{{CheckoutCartSummarySection.shippingMethodForm}}" stepKey="waitForShippingMethodForm"/>
113113
<waitForElementVisible time="30" selector="{{CheckoutCartSummarySection.total}}" stepKey="waitForTotalElement"/>
114+
<actionGroup ref="StorefrontCartEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxSection" />
114115
<!-- Discount amount is applied for product from first category only -->
115116
<actionGroup ref="StorefrontCheckCartTotalWithDiscountCategoryActionGroup" stepKey="checkDiscountIsApplied">
116117
<argument name="subtotal" value="$1,000.00"/>

0 commit comments

Comments
 (0)