Skip to content

Commit

Permalink
ENGCOM-8614: [MFTF] Updating with AdminClickInsertWidgetActionGroup #…
Browse files Browse the repository at this point in the history
…31601

 - Merge Pull Request #31601 from AnnaAPak/magento2:upd-with-AdminClickInsertWidgetActionGroup
 - Merged commits:
   1. 0693f46
  • Loading branch information
magento-engcom-team committed Jan 14, 2021
2 parents 8631818 + 0693f46 commit ba2c140
Show file tree
Hide file tree
Showing 15 changed files with 37 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
<waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$simplecategory.name$')}}" stepKey="waitForCategoryVisible" />
<click selector="{{WidgetSection.PreCreateCategory('$simplecategory.name$')}}" stepKey="selectCategory" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<!--Save cms page and go to Storefront-->
<actionGroup ref="SaveCmsPageActionGroup" stepKey="saveCmsPage"/>
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToTheStoreFront1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@
<waitForElementVisible selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="waitForBlockTitle" />
<click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
<wait time="3" stepKey="wait1" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidgetBtn" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
<waitForPageLoad stepKey="waitForPageLoad10" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidgetBtn"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad10"/>
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<waitForElementVisible selector="{{WidgetSection.CMSPage}}" stepKey="waitForPageVisible" />
<click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
<waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
<waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses1" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSlideOutCloses1"/>
<click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
<click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
Expand All @@ -62,9 +62,9 @@
</actionGroup>
<click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
<wait time="3" stepKey="wait1" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidgetBtn" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
<waitForPageLoad stepKey="waitForPageLoad6" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidgetBtn"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading2"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad6"/>
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
Expand All @@ -85,4 +85,3 @@
</after>
</test>
</tests>

Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
<waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
<wait time="3" stepKey="waitForInsertWidgetClickable"/>
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
<waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideoutCloses" />
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
Expand All @@ -70,4 +70,3 @@
</after>
</test>
</tests>

Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<scrollTo selector="{{WidgetSection.BlockPage($$createPreReqBlock.identifier$$)}}" stepKey="scrollToBlockIdentifier" />
<click selector="{{WidgetSection.BlockPage($$createPreReqBlock.identifier$$)}}" stepKey="selectPreCreateBlock" />
<waitForElementNotVisible selector="{{WidgetSection.SelectBlockTitle}}" stepKey="waitForSlideoutCloses" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForLoadingMaskToDisappear stepKey="waitingForLoading" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitingForLoading"/>
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
<click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCreateCategory" />
<waitForElementNotVisible selector="{{WidgetSection.SelectCategoryTitle}}" stepKey="waitForSlideoutCloses1" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses2" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSlideOutCloses2"/>
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
<waitForLoadingMaskToDisappear stepKey="waitLoadingMask" />
<click selector="{{WidgetSection.PreCreateProduct('$$createPreReqProduct.name$$')}}" stepKey="selectPreProduct" />
<waitForElementNotVisible selector="{{WidgetSection.SelectProductTitle}}" stepKey="waitForSlideOutCloses" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForLoadingMaskToDisappear stepKey="waitLoadingMask1" />
<waitForPageLoad stepKey="wait6" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitLoadingMask1"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait6"/>
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
<click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam3"/>
<fillField selector="{{WidgetSection.RuleParamInput('3','2')}}" userInput="1" stepKey="fillMinPrice"/>

<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForPageLoad stepKey="wait6" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait6"/>
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<selectOption selector="{{WidgetSection.ProductAttribute}}" userInput="Name" stepKey="selectProductAttributes" />
<selectOption selector="{{WidgetSection.ButtonToShow}}" userInput="Add to Cart" stepKey="selectBtnToShow" />
<selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Compared Products Grid Template" stepKey="selectTemplate" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
<selectOption selector="{{WidgetSection.ProductAttribute}}" userInput="Name" stepKey="selectProductAttributes" />
<selectOption selector="{{WidgetSection.ButtonToShow}}" userInput="Add to Cart" stepKey="selectBtnToShow" />
<selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Viewed Products Grid Template" stepKey="selectTemplate" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
<waitForPageLoad stepKey="waitForPageToLoadBeforeSelectingProduct2"/>
<click selector="{{WidgetSection.PreCreateProduct('$$product2.name$$')}}" stepKey="selectProduct2"/>
<click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts"/>
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton"/>
<waitForPageLoad stepKey="waitForPageToLoadBeforeClickingOnSaveWidget1"/>
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickOnInsertWidgetButton"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoadBeforeClickingOnSaveWidget1"/>
<click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget"/>
<waitForPageLoad stepKey="waitForSaveComplete"/>
<actionGroup ref="CompareTwoProductsOrder" stepKey="compareProductOrders1">
Expand Down Expand Up @@ -125,8 +125,8 @@
<click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectProduct1_1"/>
<click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectProduct2_2"/>
<click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts1"/>
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton1"/>
<waitForPageLoad stepKey="waitForPageToLoadBeforeClickingOnSaveWidget2"/>
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickOnInsertWidgetButton1"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoadBeforeClickingOnSaveWidget2"/>
<click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget1"/>
<waitForPageLoad stepKey="waitForSaveComplete1"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
<scrollTo selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="scrollToBlockIdentifier" />
<click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
<wait time="3" stepKey="wait1" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
<waitForPageLoad stepKey="waitForPageLoad5" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad5"/>
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<waitForElementVisible selector="{{WidgetSection.CMSPage}}" stepKey="waitForPageVisible" />
<click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
<waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
<waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses1" />
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSlideOutCloses1"/>
<click selector="{{BasicFieldNewsletterSection.save}}" stepKey="clickSaveTemplate"/>
<waitForPageLoad stepKey="waitForPageLoad10" />
<click selector="{{NewsletterWYSIWYGSection.Preview(_defaultNewsletter.name)}}" stepKey="clickPreview" />
Expand All @@ -59,4 +59,3 @@
</after>
</test>
</tests>

Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<waitForPageLoad stepKey="waitForWidgetOptions"/>
<selectOption selector="{{WidgetSection.DisplayType}}" userInput="New products" stepKey="selectDisplayType"/>
<fillField selector="{{WidgetSection.NoOfProductToDisplay}}" userInput="100" stepKey="fillNoOfProductToDisplay"/>
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="expandSeoSection"/>
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_newDefaultCmsPage.identifier}}" stepKey="fillPageUrlKey"/>
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveCmsPage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<waitForAjaxLoad stepKey="waitForAjaxLoad"/>
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="clickCategoryToEditInitial"/>
<click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitBtn"/>
<click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndClose"/>
<waitForPageLoad stepKey="waitForCmsList2"/>
Expand Down

0 comments on commit ba2c140

Please sign in to comment.