Skip to content

Commit 7b20013

Browse files
ENGCOM-8614: [MFTF] Updating with AdminClickInsertWidgetActionGroup #31601
2 parents 96327e2 + ba2c140 commit 7b20013

15 files changed

+37
-40
lines changed

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

+1-1
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

+3-3
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

+6-7
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

+2-3
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

+2-2
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

+2-2
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

+3-3
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

+2-2
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

+2-2
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

+2-2
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"/>

app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
<waitForPageLoad stepKey="waitForPageToLoadBeforeSelectingProduct2"/>
9191
<click selector="{{WidgetSection.PreCreateProduct('$$product2.name$$')}}" stepKey="selectProduct2"/>
9292
<click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts"/>
93-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton"/>
94-
<waitForPageLoad stepKey="waitForPageToLoadBeforeClickingOnSaveWidget1"/>
93+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickOnInsertWidgetButton"/>
94+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoadBeforeClickingOnSaveWidget1"/>
9595
<click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget"/>
9696
<waitForPageLoad stepKey="waitForSaveComplete"/>
9797
<actionGroup ref="CompareTwoProductsOrder" stepKey="compareProductOrders1">
@@ -125,8 +125,8 @@
125125
<click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectProduct1_1"/>
126126
<click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectProduct2_2"/>
127127
<click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts1"/>
128-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton1"/>
129-
<waitForPageLoad stepKey="waitForPageToLoadBeforeClickingOnSaveWidget2"/>
128+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickOnInsertWidgetButton1"/>
129+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoadBeforeClickingOnSaveWidget2"/>
130130
<click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget1"/>
131131
<waitForPageLoad stepKey="waitForSaveComplete1"/>
132132

app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@
7373
<scrollTo selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="scrollToBlockIdentifier" />
7474
<click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
7575
<wait time="3" stepKey="wait1" />
76-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
77-
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
78-
<waitForPageLoad stepKey="waitForPageLoad5" />
76+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
77+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
78+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad5"/>
7979
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
8080
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
8181
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>

app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
<waitForElementVisible selector="{{WidgetSection.CMSPage}}" stepKey="waitForPageVisible" />
4343
<click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
4444
<waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
45-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
46-
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
47-
<waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses1" />
45+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
46+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
47+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSlideOutCloses1"/>
4848
<click selector="{{BasicFieldNewsletterSection.save}}" stepKey="clickSaveTemplate"/>
4949
<waitForPageLoad stepKey="waitForPageLoad10" />
5050
<click selector="{{NewsletterWYSIWYGSection.Preview(_defaultNewsletter.name)}}" stepKey="clickPreview" />
@@ -59,4 +59,3 @@
5959
</after>
6060
</test>
6161
</tests>
62-

app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<waitForPageLoad stepKey="waitForWidgetOptions"/>
4545
<selectOption selector="{{WidgetSection.DisplayType}}" userInput="New products" stepKey="selectDisplayType"/>
4646
<fillField selector="{{WidgetSection.NoOfProductToDisplay}}" userInput="100" stepKey="fillNoOfProductToDisplay"/>
47-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
47+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
4848
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="expandSeoSection"/>
4949
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_newDefaultCmsPage.identifier}}" stepKey="fillPageUrlKey"/>
5050
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveCmsPage"/>

app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<waitForAjaxLoad stepKey="waitForAjaxLoad"/>
5252
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="clickCategoryToEditInitial"/>
5353
<click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
54-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
54+
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
5555
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitBtn"/>
5656
<click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndClose"/>
5757
<waitForPageLoad stepKey="waitForCmsList2"/>

0 commit comments

Comments
 (0)