Skip to content

[CMS Team 2] MFTF Redundant Waits #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 22, 2018
Merged

[CMS Team 2] MFTF Redundant Waits #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e40f86a
MAGETWO-88402: MFTF - Cleanup Redundant Waits
dhaecker Mar 13, 2018
ef408d0
MAGETWO-88402: MFTF - Cleanup Redundant Waits
dhaecker Mar 14, 2018
f3fedc2
MAGETWO-88402: MFTF - Cleanup Redundant Waits
dhaecker Mar 15, 2018
5652cf5
MAGETWO-88402: MFTF - Cleanup Redundant Waits
dhaecker Mar 15, 2018
8b447ce
MAGETWO-88402: MFTF - Cleanup Redundant Waits
dhaecker Mar 15, 2018
1dda8d6
Merge remote-tracking branch 'mainline/develop' into MAGETWO-88402-Cl…
tjwiebell Mar 21, 2018
5212de9
Merge remote-tracking branch 'mainline/develop' into MAGETWO-88402-Cl…
dhaecker Mar 22, 2018
6a5fdb4
MAGETWO-88402: MFTF - Cleanup Redundant Waits
dhaecker Mar 22, 2018
9c3f043
MAGETWO-88402: MFTF - Cleanup Redundant Waits
dhaecker Mar 22, 2018
dc6398a
MAGETWO-88402: MFTF - Cleanup Redundant Waits
dhaecker Mar 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 22 additions & 80 deletions ...cceptance/tests/functional/Magento/FunctionalTest/PageBuilder/ActionGroup/ActionGroup.xml
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 2 additions & 42 deletions ...nce/tests/functional/Magento/FunctionalTest/PageBuilder/ActionGroup/ColumnActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,49 +11,9 @@
<actionGroup name="openPageBuilderEditColumnPanel">
<moveMouseOver selector="{{PageBuilderColumnSection.columnInStage}}" x="10" y="0" stepKey="onMouseOverColumn"/>
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenu('column')}}" stepKey="waitForOptions" />
<seeElement selector="{{PageBuilderActionsSection.contentBlockOptionsMenu('column')}}" stepKey="seeContentBlockOptionsMenu"/>
<click selector="{{PageBuilderColumnSection.editColumn}}" stepKey="clickEditColumn"/>
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm" />
<!-- Required time wait due to animation -->
<wait time="0.5" stepKey="waitForAnimation" />
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
<waitForElementVisible selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm"/>
<see userInput="Edit Column" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/>
</actionGroup>
<actionGroup name="openPageBuilderEditColumnPanel2">
<moveMouseOver selector="{{PageBuilderColumnSection.columnInStage2}}" x="10" y="0" stepKey="onMouseOverColumn"/>
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenu('column')}}" stepKey="waitForOptions" />
<seeElement selector="{{PageBuilderActionsSection.contentBlockOptionsMenu('column')}}" stepKey="seeContentBlockOptionsMenu"/>
<click selector="{{PageBuilderColumnSection.editColumn}}" stepKey="clickEditColumn"/>
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm" />
<!-- Required time wait due to animation -->
<wait time="0.5" stepKey="waitForAnimation" />
<see userInput="Edit Column" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/>
</actionGroup>
<actionGroup name="openPageBuilderEditColumnPanel3">
<moveMouseOver selector="{{PageBuilderColumnSection.columnInStage3}}" x="10" y="0" stepKey="onMouseOverColumn"/>
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenu('column')}}" stepKey="waitForOptions" />
<seeElement selector="{{PageBuilderActionsSection.contentBlockOptionsMenu('column')}}" stepKey="seeContentBlockOptionsMenu"/>
<click selector="{{PageBuilderColumnSection.editColumn}}" stepKey="clickEditColumn"/>
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm" />
<!-- Required time wait due to animation -->
<wait time="0.5" stepKey="waitForAnimation" />
<see userInput="Edit Column" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/>
</actionGroup>
<actionGroup name="saveColumnSettings">
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
<waitForElementVisible time="1" selector="{{PageBuilderColumnSection.columnSaveButton}}" stepKey="waitForColumnSaveButton" />
<click selector="{{PageBuilderColumnSection.columnSaveButton}}" stepKey="clickSaveColumn"/>
<waitForElementNotVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditFormNotVisible" />
<waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForCmsPageSaveButton" />
</actionGroup>
<actionGroup name="removePageBuilderColumn">
<moveMouseOver selector="{{PageBuilderColumnSection.column}}" stepKey="onMouseOverRow"/>
<seeElement selector="{{PageBuilderColumnSection.columnOptionsMenu}}" stepKey="seeColumnOptionsMenu"/>
<click selector="{{PageBuilderColumnSection.removeColumn}}" stepKey="clickRemoveColumn"/>
<waitForElementVisible time="1" selector="{{PageBuilderActionsSection.modal}}" stepKey="waitForModal" />
<seeElement selector="{{PageBuilderActionsSection.modal}}" stepKey="seeRemovalModal"/>
<waitForElementVisible time="1" selector="{{PageBuilderActionsSection.modalOk}}" stepKey="waitForModalOk" />
<wait time="1" stepKey="waitForModalEventBinding" />
<click selector="{{PageBuilderActionsSection.modalOk}}" stepKey="confirmRemoveModal"/>
<waitForElementNotVisible time="1" selector="{{PageBuilderActionsSection.modalOk}}" stepKey="waitForModalHide" />
</actionGroup>
</actionGroups>
1 change: 1 addition & 0 deletions dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Data/ColumnData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
<data key="name">Background Repeat</data>
<data key="section">background</data>
<data key="fieldName">background_repeat</data>
<data key="value">1</data>
</entity>
<entity name="PageBuilderBackgroundAttachmentProperty" type="pagebuilder_background_attachment_property">
<data key="name">Background Attachment</data>
Expand Down
6 changes: 4 additions & 2 deletions ...tests/functional/Magento/FunctionalTest/PageBuilder/Section/PageBuilderActionsSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
<section name="PageBuilderActionsSection">
<element name="openPageBuilder" type="button" selector=".init-magento-pagebuilder" timeout="30"/>
<element name="openPageBuilderCatalog" type="button" selector="#magento-pagebuildercategory_form_description"/>
<element name="openFullScreen" type="button" selector='//*[@id="container"]/div/div[2]/div[2]/div[2]/fieldset/div[3]/div[1]/i' timeout="30"/>
<element name="stageWrapper" type="button" selector='//*[@id="container"]/div/div[2]/div[2]/div[2]/fieldset/div[3]' timeout="30"/>
<element name="openFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen']"/>
<element name="exitFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen-exit']"/>
<element name="stageWrapper" type="button" selector="//div[@class='pagebuilder-stage-wrapper']"/>
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-full-screen"/>
<element name="searchField" type="input" selector='//*[@id="pagebuilder-panel"]/div[1]/a'/>
<element name="clearSearch" type="button" selector='//*[@id="pagebuilder-panel"]/div[1]/a'/>
<element name="firstSection" type="button" selector='//*[@id="pagebuilder-panel-groups"]/li[1]' timeout="30"/>
Expand Down
32 changes: 16 additions & 16 deletions ...e/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderBannerTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,13 +396,13 @@
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBannerShowOverlayAlways">
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
</actionGroup>
<waitForElement time="2" selector="{{PageBuilderActionsSection.panelFieldControl(PageBuilderBannerNewTabProperty.section, PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="waitForElementVisible" />
<click selector="{{PageBuilderActionsSection.panelFieldControlSwitch(PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="clickProperty"/>
<wait time="1" stepKey="waitForClick1"/>
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="enterBannerNewTab">
<argument name="property" value="PageBuilderBannerNewTabProperty"/>
</actionGroup>
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
<see userInput="{{PageBuilderPageTitle.pageName}}" selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="assertTitleSavedCmsPage"/>
<amOnPage url="banner{{PageBuilderPageTitle.pageName}}" stepKey="amOnPageBuilderPage"/>
<waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
<seeElementInDOM selector="{{BannerOnFrontend.linkUrl(PageBuilderBannerLinkUrlProperty.value)}}" stepKey="seeLinkUrlInDom"/>
<seeElementInDOM selector="{{BannerOnFrontend.openInNewTab}}" stepKey="verifyLinkOpensNewWindow"/>
</test>
Expand Down Expand Up @@ -2776,9 +2776,9 @@
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBannerLinkUrl">
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
</actionGroup>
<waitForElement time="2" selector="{{PageBuilderActionsSection.panelFieldControl(PageBuilderBannerNewTabProperty.section, PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="waitForElementVisible" />
<click selector="{{PageBuilderActionsSection.panelFieldControlSwitch(PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="clickProperty"/>
<wait time="1" stepKey="waitForClick2"/>
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="enterBannerNewTab">
<argument name="property" value="PageBuilderBannerNewTabProperty"/>
</actionGroup>
<actionGroup ref="selectSlideOutPanelField" stepKey="selectButtonTypeSecondaryProperty">
<argument name="property" value="PageBuilderBannerButtonTypeSecondaryProperty"/>
</actionGroup>
Expand Down Expand Up @@ -3301,9 +3301,9 @@
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBannerLinkUrl">
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
</actionGroup>
<waitForElement time="2" selector="{{PageBuilderActionsSection.panelFieldControl(PageBuilderBannerNewTabProperty.section, PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="waitForElementVisible" />
<click selector="{{PageBuilderActionsSection.panelFieldControlSwitch(PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="clickProperty"/>
<wait time="1" stepKey="waitForClick3"/>
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="enterBannerNewTab">
<argument name="property" value="PageBuilderBannerNewTabProperty"/>
</actionGroup>
<actionGroup ref="selectSlideOutPanelField" stepKey="selectButtonTypeSecondaryProperty">
<argument name="property" value="PageBuilderBannerButtonTypeSecondaryProperty"/>
</actionGroup>
Expand Down Expand Up @@ -3828,9 +3828,9 @@
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBannerLinkUrl">
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
</actionGroup>
<waitForElement time="2" selector="{{PageBuilderActionsSection.panelFieldControl(PageBuilderBannerNewTabProperty.section, PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="waitForElementVisible" />
<click selector="{{PageBuilderActionsSection.panelFieldControlSwitch(PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="clickProperty"/>
<wait time="1" stepKey="waitForClick4"/>
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="enterBannerNewTab">
<argument name="property" value="PageBuilderBannerNewTabProperty"/>
</actionGroup>
<actionGroup ref="selectSlideOutPanelField" stepKey="selectButtonTypeSecondaryProperty">
<argument name="property" value="PageBuilderBannerButtonTypeSecondaryProperty"/>
</actionGroup>
Expand Down Expand Up @@ -4339,9 +4339,9 @@
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBannerLinkUrl">
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
</actionGroup>
<waitForElement time="2" selector="{{PageBuilderActionsSection.panelFieldControl(PageBuilderBannerNewTabProperty.section, PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="waitForElementVisible" />
<click selector="{{PageBuilderActionsSection.panelFieldControlSwitch(PageBuilderBannerNewTabProperty.fieldName)}}" stepKey="clickProperty"/>
<wait time="1" stepKey="waitForClick5"/>
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="enterBannerNewTab">
<argument name="property" value="PageBuilderBannerNewTabProperty"/>
</actionGroup>
<actionGroup ref="selectSlideOutPanelField" stepKey="selectButtonTypeSecondaryProperty">
<argument name="property" value="PageBuilderBannerButtonTypeSecondaryProperty"/>
</actionGroup>
Expand Down
Loading