Skip to content

Commit 2f8b8ad

Browse files
chittimachittima
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into PR01262023
2 parents 35081f3 + 9275a11 commit 2f8b8ad

File tree

10 files changed

+26
-21
lines changed

10 files changed

+26
-21
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<testCaseId value="MC-22625"/>
1818
<useCaseId value="MC-21926"/>
1919
<group value="checkout"/>
20-
<skip>
21-
<issueId value="ACQE-4352"/>
22-
</skip>
2320
</annotations>
2421

2522
<before>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateActiveHtmlTermEntityTest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121
</annotations>
2222
<before>
2323
<magentoCLI command="config:set checkout/options/enable_agreements 1" stepKey="setEnableTermsOnCheckout"/>
24-
24+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2525
<createData entity="SimpleTwo" stepKey="createProduct"/>
2626
<magentoCron stepKey="runCronIndex" groups="index"/>
2727

2828
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
2929
</before>
3030
<after>
3131
<magentoCLI command="config:set checkout/options/enable_agreements 0" stepKey="setDisableTermsOnCheckout"/>
32+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
3233
<deleteData createDataKey="createProduct" stepKey="deletedProduct"/>
3334

3435
<actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddUpdateDeleteWidgetOfTypeCatalogProductLinkTypeTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<description value="Admin should be able to create widget type of Catalog product link and shown on storefront"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-12209"/>
19+
<skip>
20+
<issueId value="ACQE-4481"/>
21+
</skip>
1922
</annotations>
2023

2124
<before>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/UserDeletesFolderFromMediaGalleryTest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323

2424
<!-- Step2 Disabled Old Media Gallery and Page Builder -->
2525
<magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
26-
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
26+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disablePageBuilder"/>
2727
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
2828
</before>
2929
<after>
3030
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enableOldMediaGallery"/>
31-
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
31+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="enablePageBuilder"/>
3232
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
3333
</after>
3434

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<createData entity="defaultSimpleProduct" stepKey="createProduct">
2727
<requiredEntity createDataKey="createCategory"/>
2828
</createData>
29+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2930
</before>
3031
<after>
3132
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@
3030
<fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
3131

3232
<!-- Add NY and CA tax rules -->
33-
<actionGroup ref="AddNewTaxRateNoZipActionGroup" stepKey="addNYTaxRate">
33+
<actionGroup ref="AddNewTaxRateNoZipUIActionGroup" stepKey="addNYTaxRate">
3434
<argument name="taxCode" value="SimpleTaxNY"/>
3535
</actionGroup>
3636

37-
<actionGroup ref="AddNewTaxRateNoZipActionGroup" stepKey="addCATaxRate">
37+
<actionGroup ref="AddNewTaxRateNoZipUIActionGroup" stepKey="addCATaxRate">
3838
<argument name="taxCode" value="SimpleTaxCA"/>
3939
</actionGroup>
4040

4141
<click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
42+
<see userInput="You saved the tax rule." selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessageForSavingRule"/>
4243

4344
<magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
4445
</before>
@@ -55,12 +56,12 @@
5556

5657
<!-- Delete the two tax rates that were created -->
5758
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
58-
<argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
59+
<argument name="name" value="{{SimpleTaxNY.identifier}}-{{SimpleTaxNY.rate}}"/>
5960
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
6061
</actionGroup>
6162

6263
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
63-
<argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
64+
<argument name="name" value="{{SimpleTaxCA.identifier}}-{{SimpleTaxCA.rate}}"/>
6465
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
6566
</actionGroup>
6667

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@
3030
<fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
3131

3232
<!-- Add NY and CA tax rules -->
33-
<actionGroup ref="AddNewTaxRateNoZipActionGroup" stepKey="addNYTaxRate">
33+
<actionGroup ref="AddNewTaxRateNoZipUIActionGroup" stepKey="addNYTaxRate">
3434
<argument name="taxCode" value="SimpleTaxNY"/>
3535
</actionGroup>
3636

37-
<actionGroup ref="AddNewTaxRateNoZipActionGroup" stepKey="addCATaxRate">
37+
<actionGroup ref="AddNewTaxRateNoZipUIActionGroup" stepKey="addCATaxRate">
3838
<argument name="taxCode" value="SimpleTaxCA"/>
3939
</actionGroup>
4040

4141
<click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
42+
<see userInput="You saved the tax rule." selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessageForSavingRule"/>
4243

4344
<magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
4445
</before>
@@ -55,12 +56,12 @@
5556

5657
<!-- Delete the two tax rates that were created -->
5758
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
58-
<argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
59+
<argument name="name" value="{{SimpleTaxNY.identifier}}-{{SimpleTaxNY.rate}}"/>
5960
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
6061
</actionGroup>
6162

6263
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
63-
<argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
64+
<argument name="name" value="{{SimpleTaxCA.identifier}}-{{SimpleTaxCA.rate}}"/>
6465
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
6566
</actionGroup>
6667

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@
3030
<fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
3131

3232
<!-- Add NY and CA tax rules -->
33-
<actionGroup ref="AddNewTaxRateNoZipActionGroup" stepKey="addNYTaxRate">
33+
<actionGroup ref="AddNewTaxRateNoZipUIActionGroup" stepKey="addNYTaxRate">
3434
<argument name="taxCode" value="SimpleTaxNY"/>
3535
</actionGroup>
3636

37-
<actionGroup ref="AddNewTaxRateNoZipActionGroup" stepKey="addCATaxRate">
37+
<actionGroup ref="AddNewTaxRateNoZipUIActionGroup" stepKey="addCATaxRate">
3838
<argument name="taxCode" value="SimpleTaxCA"/>
3939
</actionGroup>
4040

4141
<click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
42+
<see userInput="You saved the tax rule." selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessageForSavingRule"/>
4243

4344
<magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
4445
</before>
@@ -56,12 +57,12 @@
5657

5758
<!-- Delete the two tax rates that were created -->
5859
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
59-
<argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
60+
<argument name="name" value="{{SimpleTaxNY.identifier}}-{{SimpleTaxNY.rate}}"/>
6061
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
6162
</actionGroup>
6263

6364
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
64-
<argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
65+
<argument name="name" value="{{SimpleTaxCA.identifier}}-{{SimpleTaxCA.rate}}"/>
6566
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
6667
</actionGroup>
6768

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserViaCurlActionGroup.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
1515
<waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
1616
<click selector="{{AdminLegacyDataGridFilterSection.clear}}" stepKey="resetFilters" />
17+
<scrollTo selector="{{AdminLegacyDataGridTableSection.columnTemplateStrict(user.username, 'user_id')}}" stepKey="scrollToUserId"></scrollTo>
18+
<waitForElementVisible selector="{{AdminLegacyDataGridTableSection.columnTemplateStrict(user.username, 'user_id')}}" stepKey="waitForUserIdVisible"></waitForElementVisible>
1719
<grabTextFrom selector="{{AdminLegacyDataGridTableSection.columnTemplateStrict(user.username, 'user_id')}}" stepKey="userId" />
1820

1921
<!--

‎app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserRoleTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<testCaseId value="MC-27895"/>
1919
<group value="user"/>
2020
<group value="mtf_migrated"/>
21-
<skip>
22-
<issueId value="AC-7467"/>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -31,6 +28,7 @@
3128
<!--Create New Role-->
3229
<actionGroup ref="AdminStartCreateUserRoleActionGroup" stepKey="startCreateUserRole">
3330
<argument name="roleName" value="{{roleSales.name}}"/>
31+
<argument name="userPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
3432
</actionGroup>
3533
<actionGroup ref="AdminSaveUserRoleActionGroup" stepKey="saveNewRole"/>
3634
</before>

0 commit comments

Comments
 (0)