Skip to content

Commit e9a019d

Browse files
aplapanaaplapana
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into PR-2024-12-03
2 parents a2342d5 + 971142b commit e9a019d

18 files changed

+191
-41
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAddRestrictedRoleForGlobalSearchActionGroup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<remove keyForRemoval="waitForPageLoad2"/>
2121
<remove keyForRemoval="clickCheckbox"/>
2222
<scrollTo selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}" x="0" y="-120" stepKey="scrollToResourceElement" after="selectResourceAccessCustom"/>
23-
<click stepKey="clickTFACheckbox" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" after="waitForTfaRole"/>
23+
<scrollTo selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_User::acl_users')}}" stepKey="scrollToTwoFactor" after="clickContentBlockCheckbox"/>
24+
<waitForElementClickable selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="waitForTwoFactorToBeClickable" after="waitForTfaRole"/>
25+
<click selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="clickTFACheckbox"/>
2426
</actionGroup>
2527
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundleProductActionSection.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -14,5 +14,6 @@
1414
<element name="dropdownSelectOption" type="select" selector="//div[@class='control']/select"/>
1515
<element name="dropdownProductSelection" type="select" selector="//div[@class='control']/select/option[contains(.,'{{productName}}')]" parameterized="true"/>
1616
<element name="customOptionField" type="select" selector="[class='input-text product-custom-option']"/>
17+
<element name="bundleOption" type="text" selector="//*[@id='product-options-wrapper']//div[@class='control']//span[text()='{{productName}}']" parameterized="true"/>
1718
</section>
1819
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<requiredEntity createDataKey="createCategory"/>
3131
</createData>
3232
<!-- Create SimpleProductwithPrice100 -->
33-
<createData entity="SimpleProductQty100" stepKey="simpleProductOne">
33+
<createData entity="ApiSimpleProduct" stepKey="simpleProductOne">
3434
<requiredEntity createDataKey="createSubcategory"/>
3535
</createData>
3636
<!-- Go To Subcategory Page-->

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontPartialWordQuickSearchStemmingTest.xml

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

@@ -75,32 +75,36 @@
7575
</after>
7676
<!--Navigate to home page-->
7777
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
78-
<!--Search for word "5127S"-->
78+
<!--Search for word "5127AB"-->
7979
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="search1">
80-
<argument name="phrase" value="5127S"/>
80+
<argument name="phrase" value="5127AB"/>
8181
</actionGroup>
8282
<!--Assert that product1 is present in the search result-->
83-
<actionGroup ref="StorefrontAssertProductNameOnProductMainPageActionGroup" stepKey="seeProduct1">
83+
<comment userInput="BIC workaround" stepKey="seeProduct1"/>
84+
<actionGroup ref="AssertStorefrontProductNameIsNotOnProductMainPageActionGroup" stepKey="dontSeeProduct1inAB">
8485
<argument name="productName" value="$$product1.name$$"/>
8586
</actionGroup>
8687
<!--Assert that product2 is not present in the search result-->
8788
<actionGroup ref="AssertStorefrontProductNameIsNotOnProductMainPageActionGroup" stepKey="dontSeeProduct2">
8889
<argument name="productName" value="$$product2.name$$"/>
8990
</actionGroup>
9091
<!--Assert that product2 is not present in the search result-->
91-
<actionGroup ref="AssertStorefrontProductNameIsNotOnProductMainPageActionGroup" stepKey="dontSeeProduct3">
92+
<comment userInput="BIC workaround" stepKey="dontSeeProduct3"/>
93+
<actionGroup ref="StorefrontAssertProductNameOnProductMainPageActionGroup" stepKey="seeProduct3inAB">
9294
<argument name="productName" value="$$product3.name$$"/>
9395
</actionGroup>
9496
<!--Assert that product4 is present in the search result-->
95-
<actionGroup ref="StorefrontAssertProductNameOnProductMainPageActionGroup" stepKey="seeProduct4">
97+
<comment userInput="BIC workaround" stepKey="seeProduct4"/>
98+
<actionGroup ref="AssertStorefrontProductNameIsNotOnProductMainPageActionGroup" stepKey="dontSeeProduct4inAB">
9699
<argument name="productName" value="$$product4.name$$"/>
97100
</actionGroup>
98101
<!--Assert that product5 is not present in the search result-->
99102
<actionGroup ref="AssertStorefrontProductNameIsNotOnProductMainPageActionGroup" stepKey="dontSeeProduct5">
100103
<argument name="productName" value="$$product5.name$$"/>
101104
</actionGroup>
102105
<!--Assert that product6 is not present in the search result-->
103-
<actionGroup ref="AssertStorefrontProductNameIsNotOnProductMainPageActionGroup" stepKey="dontSeeProduct6">
106+
<comment userInput="BIC workaround" stepKey="dontSeeProduct6"/>
107+
<actionGroup ref="StorefrontAssertProductNameOnProductMainPageActionGroup" stepKey="seeProduct6inAB">
104108
<argument name="productName" value="$$product6.name$$"/>
105109
</actionGroup>
106110

@@ -163,4 +167,3 @@
163167
</actionGroup>
164168
</test>
165169
</tests>
166-

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

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

@@ -23,7 +23,7 @@
2323
<magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
2424
<!-- Create category -->
2525
<createData entity="_defaultCategory" stepKey="createCategory"/>
26-
26+
2727
<!-- Create Configurable Product -->
2828
<createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
2929
<requiredEntity createDataKey="createCategory"/>
@@ -120,7 +120,6 @@
120120
<argument name="indices" value=""/>
121121
</actionGroup>
122122
</after>
123-
124123
<!-- Add Simple Product to cart -->
125124
<amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
126125
<waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,6 +20,15 @@
2020
<before>
2121
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
23+
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
24+
<actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="switchDefaultWebsite">
25+
<argument name="website" value="_defaultWebsite"/>
26+
</actionGroup>
27+
<actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="enableTableRatesShippingMethodForDefaultWebsite">
28+
<argument name="status" value="0"/>
29+
</actionGroup>
30+
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigs"/>
31+
2332
<magentoCLI command="config:set {{EnablePaymentBankTransferConfigData.path}} {{EnablePaymentBankTransferConfigData.value}}" stepKey="enableBankTransferPayment"/>
2433
<createData entity="SimpleProduct2" stepKey="simpleProduct">
2534
<field key="price">50.00</field>

‎app/code/Magento/Downloadable/Test/Mftf/Test/VerifyDisableDownloadableProductSamplesAreNotAccessibleTest.xml

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

@@ -19,6 +19,8 @@
1919
<useCaseId value="MC-14824"/>
2020
<group value="downloadable"/>
2121
<group value="catalog"/>
22+
<!-- Will be fixed in the scope of ACQE-7464 -->
23+
<group value="pr_exclude"/>
2224
</annotations>
2325
<before>
2426
<!-- Add downloadable domains -->

‎app/code/Magento/Downloadable/Test/Mftf/Test/VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest.xml

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

@@ -18,6 +18,8 @@
1818
<testCaseId value="MC-35639"/>
1919
<group value="downloadable"/>
2020
<group value="catalog"/>
21+
<!-- Will be fixed in the scope of ACQE-7465 -->
22+
<group value="pr_exclude"/>
2123
</annotations>
2224
<before>
2325
<!-- Enable show out of stock product -->

‎app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyAutoGenerateKeyTest.xml

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

@@ -18,6 +18,9 @@
1818
<group value="encryption_key"/>
1919
<group value="pr_exclude"/>
2020
<group value="cloud"/>
21+
<skip>
22+
<issueId value="AC-12680"/>
23+
</skip>
2124
</annotations>
2225

2326
<before>

‎app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyManualGenerateKeyTest.xml

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

@@ -18,6 +18,9 @@
1818
<group value="encryption_key"/>
1919
<group value="pr_exclude"/>
2020
<group value="cloud"/>
21+
<skip>
22+
<issueId value="AC-12680"/>
23+
</skip>
2124
</annotations>
2225

2326
<before>

0 commit comments

Comments
 (0)