Skip to content

Commit 5fa09cc

Browse files
gabrieldagamagabrieldagama
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #31321: Add missing "VAT Number" field to customer registration page (by @vovayatsyuk) - #31603: [MFTF] Adding AdminGoToOrderStatusPageActionGroup (by @AnnaAPak) - #31601: [MFTF] Updating with AdminClickInsertWidgetActionGroup (by @AnnaAPak) - #31394: [MFTF] Refactoring AdminCheckingCreditMemoTotalsTest (by @AnnaAPak) Fixed GitHub Issues: - #31326: [Issue] Add missing "VAT Number" field to customer registration page (reported by @m2-assistant[bot]) has been fixed in #31321 by @vovayatsyuk in 2.4-develop branch Related commits: 1. e5444ad 2. 01f3185 3. d01133d 4. 13b966a 5. ecc30d5 6. 837a48a 7. 8b4e8b5 8. 93a0469 9. 1f9802d 10. 6bd52c9 11. a24dce4 12. c9bcf3d 13. 71428b5 - #31624: [Issue] [MFTF] Adding AdminGoToOrderStatusPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #31603 by @AnnaAPak in 2.4-develop branch Related commits: 1. 5d84e2a 2. d766016 3. b628917 - #31626: [Issue] [MFTF] Updating with AdminClickInsertWidgetActionGroup (reported by @m2-assistant[bot]) has been fixed in #31601 by @AnnaAPak in 2.4-develop branch Related commits: 1. 0693f46 - #31403: [Issue] [MFTF] Refactoring AdminCheckingCreditMemoTotalsTest (reported by @m2-assistant[bot]) has been fixed in #31394 by @AnnaAPak in 2.4-develop branch Related commits: 1. cfa15e1
2 parents af3e2e4 + 47bf287 commit 5fa09cc

25 files changed

+168
-65
lines changed

‎app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListCheckWidgetOrderTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
7171
<waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$simplecategory.name$')}}" stepKey="waitForCategoryVisible" />
7272
<click selector="{{WidgetSection.PreCreateCategory('$simplecategory.name$')}}" stepKey="selectCategory" />
73-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
73+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
7474
<!--Save cms page and go to Storefront-->
7575
<actionGroup ref="SaveCmsPageActionGroup" stepKey="saveCmsPage"/>
7676
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToTheStoreFront1">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@
110110
<waitForElementVisible selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="waitForBlockTitle" />
111111
<click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
112112
<wait time="3" stepKey="wait1" />
113-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidgetBtn" />
114-
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
115-
<waitForPageLoad stepKey="waitForPageLoad10" />
113+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidgetBtn"/>
114+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
115+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad10"/>
116116
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
117117
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
118118
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
<waitForElementVisible selector="{{WidgetSection.CMSPage}}" stepKey="waitForPageVisible" />
4141
<click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
4242
<waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
43-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
44-
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
45-
<waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses1" />
43+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
44+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
45+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSlideOutCloses1"/>
4646
<click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
4747
<click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>
4848
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
@@ -62,9 +62,9 @@
6262
</actionGroup>
6363
<click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
6464
<wait time="3" stepKey="wait1" />
65-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidgetBtn" />
66-
<waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
67-
<waitForPageLoad stepKey="waitForPageLoad6" />
65+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidgetBtn"/>
66+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading2"/>
67+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad6"/>
6868
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
6969
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
7070
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
@@ -85,4 +85,3 @@
8585
</after>
8686
</test>
8787
</tests>
88-

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
4949
<waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
5050
<wait time="3" stepKey="waitForInsertWidgetClickable"/>
51-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
52-
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
51+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
52+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
5353
<waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideoutCloses" />
5454
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
5555
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
@@ -70,4 +70,3 @@
7070
</after>
7171
</test>
7272
</tests>
73-

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
<scrollTo selector="{{WidgetSection.BlockPage($$createPreReqBlock.identifier$$)}}" stepKey="scrollToBlockIdentifier" />
5252
<click selector="{{WidgetSection.BlockPage($$createPreReqBlock.identifier$$)}}" stepKey="selectPreCreateBlock" />
5353
<waitForElementNotVisible selector="{{WidgetSection.SelectBlockTitle}}" stepKey="waitForSlideoutCloses" />
54-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
55-
<waitForLoadingMaskToDisappear stepKey="waitingForLoading" />
54+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
55+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitingForLoading"/>
5656
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
5757
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
5858
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
5050
<click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCreateCategory" />
5151
<waitForElementNotVisible selector="{{WidgetSection.SelectCategoryTitle}}" stepKey="waitForSlideoutCloses1" />
52-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
53-
<waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses2" />
52+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
53+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSlideOutCloses2"/>
5454
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
5555
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
5656
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
<waitForLoadingMaskToDisappear stepKey="waitLoadingMask" />
5656
<click selector="{{WidgetSection.PreCreateProduct('$$createPreReqProduct.name$$')}}" stepKey="selectPreProduct" />
5757
<waitForElementNotVisible selector="{{WidgetSection.SelectProductTitle}}" stepKey="waitForSlideOutCloses" />
58-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
59-
<waitForLoadingMaskToDisappear stepKey="waitLoadingMask1" />
60-
<waitForPageLoad stepKey="wait6" />
58+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
59+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitLoadingMask1"/>
60+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait6"/>
6161
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
6262
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
6363
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
<click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam3"/>
8080
<fillField selector="{{WidgetSection.RuleParamInput('3','2')}}" userInput="1" stepKey="fillMinPrice"/>
8181

82-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
83-
<waitForPageLoad stepKey="wait6" />
82+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
83+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait6"/>
8484
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
8585
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
8686
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
<selectOption selector="{{WidgetSection.ProductAttribute}}" userInput="Name" stepKey="selectProductAttributes" />
5252
<selectOption selector="{{WidgetSection.ButtonToShow}}" userInput="Add to Cart" stepKey="selectBtnToShow" />
5353
<selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Compared Products Grid Template" stepKey="selectTemplate" />
54-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
55-
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
54+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
55+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
5656
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
5757
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
5858
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<selectOption selector="{{WidgetSection.ProductAttribute}}" userInput="Name" stepKey="selectProductAttributes" />
5151
<selectOption selector="{{WidgetSection.ButtonToShow}}" userInput="Add to Cart" stepKey="selectBtnToShow" />
5252
<selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Viewed Products Grid Template" stepKey="selectTemplate" />
53-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
54-
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
53+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
54+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
5555
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
5656
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
5757
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>

0 commit comments

Comments
 (0)