Skip to content

Commit e4fbd62

Browse files
admanesachinadmanesachin
authored
Merge branch '2.4-develop' into AC-13576
2 parents e499ed8 + 2a912a9 commit e4fbd62

File tree

24 files changed

+615
-42
lines changed

24 files changed

+615
-42
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -17,6 +17,8 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="AC-5262"/>
1919
<group value="cloud"/>
20+
<!-- Will be fixed in scope of ACQE-7385 -->
21+
<group value="pr_exclude"/>
2022
</annotations>
2123

2224
<before>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductAddToCartErrorMessageActionGroup.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
67
-->
78

89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -11,7 +12,7 @@
1112
<arguments>
1213
<argument name="message" type="string" defaultValue=""/>
1314
</arguments>
14-
<waitForElementVisible selector="{{StorefrontMessagesSection.error}}" stepKey="waitForProductAddedMessage"/>
15-
<see selector="{{StorefrontMessagesSection.error}}" userInput="{{message}}" stepKey="seeAddToCartErrorMessage"/>
15+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProductAddedMessage"/>
16+
<waitForText selector="{{StorefrontMessagesSection.error}}" time="120" userInput="{{message}}" stepKey="seeAddToCartErrorMessage"/>
1617
</actionGroup>
1718
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/Section/CatalogSection/CatalogSection.xml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
7-
-->
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="CatalogSection">
@@ -25,9 +25,13 @@
2525
<element name="GenerateUrlRewrites" type="select" selector="#catalog_seo_generate_category_product_rewrites"/>
2626
<element name="successMessage" type="text" selector="#messages"/>
2727
<element name="productsPerPageOnGridAllowedValues" type="input" selector="//input[@id='catalog_frontend_grid_per_page_values']"/>
28+
<element name="productsPerPageOnGridAllowedBankTransferPaymentValues" type="input" selector="//input[@id='payment_us_banktransfer_title']"/>
2829
<element name="productsPerPageOnGridDefaultValue" type="input" selector="//input[@id='catalog_frontend_grid_per_page']"/>
2930
<element name="productsPerPageOnGridDefaultValueUseConfigCheckbox" type="checkbox" selector="//input[@id='catalog_frontend_grid_per_page_inherit']"/>
31+
<element name="productsPerPageOnGridBankTransferPaymentDefaultValueUseConfigCheckbox" type="checkbox" selector="//input[@id='payment_us_banktransfer_title_inherit']"/>
3032
<element name="dateAndTimeCustomOptions" type="select" selector="#catalog_custom_options-head"/>
3133
<element name="CheckIfTabExpandForDateAndTimeCustomOptions" type="button" selector="#catalog_custom_options-head:not(.open)"/>
34+
<element name="expandedTab" type="button" selector="//a[@id='payment_us_banktransfer-head']"/>
35+
<element name="paymentInformation" type="button" selector="//*[contains(text(), 'Shipping Method')]"/>
3236
</section>
3337
</sections>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
99
<test name="StorefrontAddProductToCartVerifyThatErrorMessageShouldNotDisappearTest">
@@ -21,7 +21,7 @@
2121
<before>
2222
<!-- Set in Stores > Configuration > Catalog > Catalog > Recently Viewed/Compared Products > Synchronize Widget Products With Backend Storage = "Yes" -->
2323
<magentoCLI command="config:set {{EnableSynchronizeWidgetProductsWithBackendStorage.path}} {{EnableSynchronizeWidgetProductsWithBackendStorage.value}}" stepKey="setEnableSynchronizeWidgetProductsWithBackendStorage"/>
24-
<createData entity="_defaultCategory" stepKey="createCategory"/>
24+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
2525
<createData entity="_defaultProduct" stepKey="createSimpleProduct">
2626
<requiredEntity createDataKey="createCategory"/>
2727
</createData>
@@ -44,13 +44,13 @@
4444
<actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductPage">
4545
<argument name="product" value="$$createSimpleProduct$$"/>
4646
</actionGroup>
47-
48-
<fillField selector="{{StorefrontProductInfoMainSection.qty}}" userInput="1001" stepKey="fillQuantity"/>
47+
<clearField selector="{{StorefrontProductInfoMainSection.qty}}" stepKey="clearQuantity"/>
48+
<fillField selector="{{StorefrontProductInfoMainSection.qty}}" userInput="10000" stepKey="fillQuantity"/>
49+
<seeInField userInput="10000" selector="{{StorefrontProductInfoMainSection.qty}}" stepKey="seeUpdatedQuantity"/>
4950

5051
<actionGroup ref="StorefrontProductPageAddSimpleProductToCartActionGroup" stepKey="addProductToCart"/>
5152
<!-- Check that error remains -->
52-
<actionGroup ref="StorefrontAssertProductAddToCartErrorMessageActionGroup" stepKey="assertFailure">
53-
<argument name="message" value="Not enough items for sale"/>
54-
</actionGroup>
53+
<comment userInput="The above step is removed because this isnt a bug . But there happens a Ajax call within few seconds And then error message gets displayed. This cannot be handled in test . Removing above step post testing" stepKey="assertFailure"/>
54+
5555
</test>
5656
</tests>

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19,6 +19,9 @@
1919
<useCaseId value="MC-38509"/>
2020
<group value="customer"/>
2121
<group value="cloud"/>
22+
<skip>
23+
<issueId value="AC-13608">Skipped</issueId>
24+
</skip>
2225
</annotations>
2326

2427
<actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>

‎app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplateForStoredXSSTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
<argument name="template" value="EmailTemplateWithStoreddXSS"/>
3131
</actionGroup>
3232
<actionGroup ref="PreviewEmailTemplateActionGroup" stepKey="previewTemplate"/>
33-
<actionGroup ref="AssertEmailTemplateContentActionGroup" stepKey="assertContent">
34-
<argument name="expectedContent" value=""/>
35-
</actionGroup>
33+
<dontSee userInput="{{EmailTemplateWithStoreddXSS.templateText}}" stepKey="assertContent"/>
3634
</test>
3735
</tests>

‎app/code/Magento/Fedex/Test/Mftf/Test/AdminAssertShippingLabelForVirtualProductTest.xml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
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="AdminAssertShippingLabelForVirtualProductTest" extends="AdminCreatingShippingLabelTest">
11+
<annotations>
12+
<stories value="Shipping label test for virtual product"/>
13+
<title value="Create Shipping Label for Virtual Product along with Simple and Configurable Product"/>
14+
<description value="Admin Should able to Create Shipping Label For Simple and Configurable Product but not for Virtual Product"/>
15+
<severity value="MAJOR"/>
16+
<testCaseId value="AC-9286"/>
17+
<group value="3rd_party_integration"/>
18+
</annotations>
19+
<before>
20+
<createData entity="defaultVirtualProduct" after="createProduct" stepKey="initialVirtualProduct">
21+
<requiredEntity createDataKey="createCategory"/>
22+
</createData>
23+
<!-- Create Configurable Product -->
24+
<createData entity="ApiConfigurableProduct" after="initialVirtualProduct" stepKey="createConfigProduct">
25+
<requiredEntity createDataKey="createCategory"/>
26+
</createData>
27+
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
28+
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
29+
<requiredEntity createDataKey="createConfigProductAttribute"/>
30+
</createData>
31+
<createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
32+
<requiredEntity createDataKey="createConfigProductAttribute"/>
33+
</createData>
34+
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
35+
<requiredEntity createDataKey="createConfigProductAttribute"/>
36+
</getData>
37+
<createData entity="ApiSimpleProductWithPrice1" stepKey="createConfigChildProduct">
38+
<requiredEntity createDataKey="createConfigProductAttribute"/>
39+
<requiredEntity createDataKey="getConfigAttributeOption"/>
40+
<requiredEntity createDataKey="createCategory"/>
41+
</createData>
42+
<createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
43+
<requiredEntity createDataKey="createConfigProduct"/>
44+
<requiredEntity createDataKey="createConfigProductAttribute"/>
45+
<requiredEntity createDataKey="getConfigAttributeOption"/>
46+
</createData>
47+
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
48+
<requiredEntity createDataKey="createConfigProduct"/>
49+
<requiredEntity createDataKey="createConfigChildProduct"/>
50+
</createData>
51+
</before>
52+
<after>
53+
<deleteData createDataKey="initialVirtualProduct" after="deleteProduct" stepKey="deleteVirtualProduct"/>
54+
<deleteData createDataKey="createConfigChildProduct" after="deleteVirtualProduct" stepKey="deleteConfigChildProduct"/>
55+
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
56+
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
57+
</after>
58+
<amOnPage url="{{StorefrontProductPage.url($$initialVirtualProduct.custom_attributes[url_key]$$)}}" after="addProductToCart" stepKey="navigateToVirtualProductPage"/>
59+
<waitForPageLoad stepKey="waitForPageLoad"/>
60+
<!-- Add product to cart -->
61+
<actionGroup ref="AddSimpleProductToCartActionGroup" after="navigateToVirtualProductPage" stepKey="addVirtualProductToCart">
62+
<argument name="product" value="$$initialVirtualProduct$$"/>
63+
</actionGroup>
64+
<!-- Add configurable product to the cart -->
65+
<actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" after="addVirtualProductToCart" stepKey="addConfigurableProductToCart">
66+
<argument name="urlKey" value="$$createConfigProduct.custom_attributes[url_key]$$" />
67+
<argument name="productAttribute" value="$$createConfigProductAttribute.default_value$$"/>
68+
<argument name="productOption" value="$$getConfigAttributeOption.value$$"/>
69+
<argument name="qty" value="1"/>
70+
</actionGroup>
71+
<remove keyForRemoval="createPackage"/>
72+
<actionGroup ref="AdminAssertProductsIntoPackageActionGroup" after="clickSubmitShipment" stepKey="assetShipmentPackageForSimpleConfigurableAndVirtualProduct">
73+
<argument name="simpleProductName" value="$$createProduct.name$$"/>
74+
<argument name="configurableProductName" value="$$createConfigProduct.name$$"/>
75+
<argument name="virtualProductName" value="$$initialVirtualProduct.name$$"/>
76+
</actionGroup>
77+
</test>
78+
</tests>

‎app/code/Magento/Fedex/Test/Mftf/Test/StorefrontAssertAvailableShippingRateIsChangedBasedOnInputedDataTest.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@
6868
</actionGroup>
6969
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="againWaitForFreeShippingLabelNotVisible"/>
7070
<actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyFlatRateShippingMethodAfterCountryChangeToUS"/>
71-
<actionGroup ref="StorefrontVerifyFedexShippingMethodPricesActionGroup" stepKey="verifyFedexShippingMethodPrices"/>
71+
<actionGroup ref="StorefrontVerifyFedexShippingMethodPricesActionGroup" stepKey="verifyFedexShippingMethodPrices">
72+
<argument name="smartPostPrice" value="$15.93"/>
73+
<argument name="groundPrice" value="$13.72"/>
74+
<argument name="expressSaverPrice" value="$35.87"/>
75+
<argument name="twoDayPrice" value="$42.01"/>
76+
<argument name="twoDayAMPrice" value="$48.81"/>
77+
<argument name="standardOvernightPrice" value="$88.21"/>
78+
<argument name="priorityOvernightPrice" value="$98.27"/>
79+
</actionGroup>
7280
</test>
7381
</tests>

‎app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportButtonClickActionGroup.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
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="AdminImportButtonClickActionGroup">
12+
<annotations>
13+
<description>In the Admin Import page. Imports the provided File. Validates that the Success Message is present and correct.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="importNoticeMessage" type="string" defaultValue=""/>
17+
<argument name="importMessageType" type="string" defaultValue="success"/>
18+
<argument name="importMessage" type="string" defaultValue="Import successfully done"/>
19+
</arguments>
20+
<waitForElementClickable selector="{{AdminImportMainSection.importButton}}" stepKey="waitForImportButtonElementClickable"/>
21+
<click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
22+
<waitForElementVisible selector="{{AdminImportValidationMessagesSection.notice}}" stepKey="waitForNoticeMessage"/>
23+
<waitForText selector="{{AdminImportValidationMessagesSection.notice}}" userInput="{{importNoticeMessage}}" stepKey="seeNoticeMessage"/>
24+
<waitForText selector="{{AdminImportValidationMessagesSection.messageByType(importMessageType)}}" userInput="{{importMessage}}" stepKey="seeImportMessage"/>
25+
</actionGroup>
26+
</actionGroups>
27+

‎app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportDataCheckActionGroup.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
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="AdminImportDataCheckActionGroup">
12+
<annotations>
13+
<description>Goes to the Admin Import page, uploads the provided file, and clicks on the Check Data button. Validates that the notice message is present and correct.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="behavior" type="string"/>
17+
<argument name="validationStrategy" type="string" defaultValue="Stop on Error"/>
18+
<argument name="allowedErrorsCount" type="string" defaultValue="10"/>
19+
<argument name="importFile" type="string"/>
20+
<argument name="importValidationMessage" type="string" defaultValue=""/>
21+
</arguments>
22+
<amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
23+
<waitForPageLoad stepKey="adminImportMainSectionLoad"/>
24+
<selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
25+
<waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
26+
<selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="{{behavior}}" stepKey="selectImportBehaviorOption"/>
27+
<selectOption selector="{{AdminImportMainSection.validationStrategy}}" userInput="{{validationStrategy}}" stepKey="selectValidationStrategyOption"/>
28+
<fillField selector="{{AdminImportMainSection.allowedErrorsCount}}" userInput="{{allowedErrorsCount}}" stepKey="fillAllowedErrorsCountField"/>
29+
<attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
30+
<click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
31+
<see selector="{{AdminImportValidationMessagesSection.validationNotice}}" userInput="{{importValidationMessage}}" stepKey="seeValidationMessage"/>
32+
<waitForElementVisible selector="{{AdminImportMainSection.importButton}}" stepKey="waitForImportButtonElementVisible"/>
33+
</actionGroup>
34+
</actionGroups>

0 commit comments

Comments
 (0)