Skip to content
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

Jump to bottom

[MFTF] Final set of changes to improve the MFTF tests #369

Closed
wants to merge 6 commits into from
Closed

[MFTF] Final set of changes to improve the MFTF tests #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
351dcef
REFACTOR: Extract Action Groups to separate files (MFTF best practices)
lbajsarowicz Jan 9, 2020
f4f4b00
Add *ActionGroup suffix when missing, stepKey should be `camelCase` (…
lbajsarowicz Jan 28, 2020
2c972f1
ActionGroup name should be PascalCase
lbajsarowicz Jan 28, 2020
fec1802
Invalid Search & Replace pattern failure + handle PascalCase `extends…
lbajsarowicz Jan 29, 2020
3ee611f
Merge remote-tracking branch 'origin/develop' into refactor/final-mft…
lbajsarowicz Jan 31, 2020
f0c80df
Merge latest version of develop branch
lbajsarowicz Jan 31, 2020
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
16 changes: 8 additions & 8 deletions app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="navigateToCMSPage">
<actionGroup name="NavigateToCMSPageActionGroup">
<!-- This goes in CE repo -->
<arguments>
<argument name="CMSPage"/>
Expand All @@ -27,18 +27,18 @@
<waitForPageLoad stepKey="waitForPageLoad2"/>
<seeElement selector="{{CmsNewPagePageContentSection.header}}" stepKey="seeContentSectionHeaderForPage"/>
</actionGroup>
<actionGroup name="navigateToAPageWithPageBuilder">
<actionGroup name="NavigateToAPageWithPageBuilderActionGroup">
<waitForPageLoad stepKey="waitForDashboardPageLoad"/>
<amOnPage url="{{CmsPagesPage.url}}/new" stepKey="amOnPageBuilderPage"/>
<waitForPageLoad stepKey="waitForPageLoad"/>
</actionGroup>
<actionGroup name="addPageBuilderPageTitle">
<actionGroup name="AddPageBuilderPageTitleActionGroup">
<arguments>
<argument name="contentType"/>
</arguments>
<fillField selector="{{CmsNewPagePageActionsSection.pageTitle}}" userInput="{{contentType.name}}{{PageBuilderPageTitle.pageName}}" stepKey="enterPageTitle"/>
</actionGroup>
<actionGroup name="switchToPageBuilderStage">
<actionGroup name="SwitchToPageBuilderStageActionGroup">
<arguments>
<argument name="sectionSelector" defaultValue="{{CmsNewPagePageContentSection.header}}" type="string"/>
<argument name="sectionDependentSelector" defaultValue="{{CmsNewPagePageContentSection.header}}._show" type="string"/>
Expand All @@ -51,20 +51,20 @@
<waitForElementNotVisible selector="{{PageBuilderStage.stageLoading}}" stepKey="waitForStageLoadingGraphicNotVisible"/>
<waitForElementVisible time="30" selector="{{RowOnStage.base(rowIndex)}}" stepKey="waitForPageBuilderRow"/>
</actionGroup>
<actionGroup name="verifyPageBuilderVisibleOnPage">
<actionGroup name="VerifyPageBuilderVisibleOnPageActionGroup">
<waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="seePageBuilderVisible"/>
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
</actionGroup>
<actionGroup name="verifyPageBuilderVisibleOnStaging">
<actionGroup name="VerifyPageBuilderVisibleOnStagingActionGroup">
<scrollTo selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="scrollToIdentifyPageBuilder"/>
<waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="seePageBuilderVisible"/>
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
</actionGroup>
<actionGroup name="verifyPageBuilderNotVisibleOnPage">
<actionGroup name="VerifyPageBuilderNotVisibleOnPageActionGroup">
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
<dontSee selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="seePageBuilderVisible"/>
</actionGroup>
<actionGroup name="verifyFullWidthLayout">
<actionGroup name="VerifyFullWidthLayoutActionGroup">
<arguments>
<argument name="index" defaultValue="0" type="string"/>
</arguments>
Expand Down
56 changes: 28 additions & 28 deletions app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="fillSlideOutPanelFieldMargins">
<actionGroup name="FillSlideOutPanelFieldMarginsActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
Expand All @@ -19,15 +19,15 @@
<fillField selector="{{AdvancedForm.advancedMarginBottom}}" userInput="{{property.marginBottom}}" stepKey="fillMarginBottomField"/>
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
</actionGroup>
<actionGroup name="fillSlideOutPanelSingleFieldMarginsOrPadding">
<actionGroup name="FillSlideOutPanelSingleFieldMarginsOrPaddingActionGroup">
<arguments>
<argument name="field" type="string"/>
<argument name="value" type="string"/>
</arguments>
<waitForElement selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" stepKey="waitForElement"/>
<fillField selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" userInput="{{value}}" stepKey="fillFieldMarginOrPadding"/>
</actionGroup>
<actionGroup name="validateMarginsOrPaddingError">
<actionGroup name="ValidateMarginsOrPaddingErrorActionGroup">
<arguments>
<argument name="property"/>
<argument name="errorMessage" type="string"/>
Expand All @@ -36,7 +36,7 @@
<seeElement selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="seeElementSectionChangedIcon"/>
<see userInput="{{errorMessage}}" selector="{{AdvancedForm.advancedMarginAndPaddingErrorMessage}}" stepKey="seeErrorMessage"/>
</actionGroup>
<actionGroup name="fillSlideOutPanelFieldPadding">
<actionGroup name="FillSlideOutPanelFieldPaddingActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
Expand All @@ -47,7 +47,7 @@
<fillField selector="{{AdvancedForm.advancedPaddingBottom}}" userInput="{{property.paddingBottom}}" stepKey="fillPaddingBottomField"/>
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
</actionGroup>
<actionGroup name="fillSlideOutPanelFieldMarginsAndPadding">
<actionGroup name="FillSlideOutPanelFieldMarginsAndPaddingActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
Expand All @@ -64,7 +64,7 @@
<fillField selector="{{AdvancedForm.advancedPaddingLeft}}" userInput="{{property.paddingLeft}}" stepKey="fillPaddingLeftField"/>
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
</actionGroup>
<actionGroup name="clearSlideOutPanelFieldMargins">
<actionGroup name="ClearSlideOutPanelFieldMarginsActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
Expand All @@ -75,7 +75,7 @@
<clearField selector="{{AdvancedForm.advancedMarginBottom}}" stepKey="clearMarginBottomField"/>
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
</actionGroup>
<actionGroup name="clearSlideOutPanelFieldPadding">
<actionGroup name="ClearSlideOutPanelFieldPaddingActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
Expand All @@ -86,7 +86,7 @@
<clearField selector="{{AdvancedForm.advancedPaddingBottom}}" stepKey="clearPaddingBottomField"/>
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
</actionGroup>
<actionGroup name="clearSlideOutPanelFieldMarginsAndPadding">
<actionGroup name="ClearSlideOutPanelFieldMarginsAndPaddingActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
Expand All @@ -103,7 +103,7 @@
<clearField selector="{{AdvancedForm.advancedPaddingBottom}}" stepKey="clearPaddingBottomField"/>
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
</actionGroup>
<actionGroup name="seeInMarginFieldsSlideOutPanel">
<actionGroup name="SeeInMarginFieldsSlideOutPanelActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
Expand All @@ -113,7 +113,7 @@
<seeInField selector="{{AdvancedForm.advancedMarginBottom}}" userInput="{{property.marginBottom}}" stepKey="seeMarginBottomField"/>
<seeInField selector="{{AdvancedForm.advancedMarginLeft}}" userInput="{{property.marginLeft}}" stepKey="seeMarginLeftField"/>
</actionGroup>
<actionGroup name="seeInPaddingFieldsSlideOutPanel">
<actionGroup name="SeeInPaddingFieldsSlideOutPanelActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
Expand All @@ -123,7 +123,7 @@
<seeInField selector="{{AdvancedForm.advancedPaddingBottom}}" userInput="{{property.paddingBottom}}" stepKey="seePaddingBottomField"/>
<seeInField selector="{{AdvancedForm.advancedPaddingLeft}}" userInput="{{property.paddingLeft}}" stepKey="seePaddingLeftField"/>
</actionGroup>
<actionGroup name="seeInMarginsAndPaddingFieldSlideOutPanel">
<actionGroup name="SeeInMarginsAndPaddingFieldSlideOutPanelActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
Expand All @@ -137,7 +137,7 @@
<seeInField selector="{{AdvancedForm.advancedPaddingLeft}}" userInput="{{property.paddingLeft}}" stepKey="fillPaddingLeftField"/>
<seeInField selector="{{AdvancedForm.advancedPaddingBottom}}" userInput="{{property.paddingBottom}}" stepKey="fillPaddingBottomField"/>
</actionGroup>
<actionGroup name="validateMarginsAndPaddingPlaceholderTextSlideOutPanel">
<actionGroup name="ValidateMarginsAndPaddingPlaceholderTextSlideOutPanelActionGroup">
<arguments>
<argument name="property" defaultValue="PageBuilderAdvancedMarginsAndPaddingDefaultProperty"/>
</arguments>
Expand All @@ -151,12 +151,12 @@
<seeElement selector="{{AdvancedForm.advancedMarginAndPaddingPlaceholderText('marginBottom', property.placeholderMarginBottom)}}" stepKey="seeMarginBottomPlaceholder"/>
<seeElement selector="{{AdvancedForm.advancedMarginAndPaddingPlaceholderText('marginLeft', property.placeholderMarginLeft)}}" stepKey="seeMarginLeftPlaceholder"/>
</actionGroup>
<actionGroup name="validateAdvancedConfigurationNotes">
<actionGroup name="ValidateAdvancedConfigurationNotesActionGroup">
<waitForElementVisible time="10" selector="{{AdvancedForm.cssClassesNote}}" stepKey="waitForElementVisibleCssClassesNote"/>
<waitForElementVisible time="10" selector="{{AdvancedForm.marginNote}}" stepKey="waitForElementVisibleMarginNote"/>
<waitForElementVisible time="10" selector="{{AdvancedForm.paddingNote}}" stepKey="waitForElementVisiblePaddingNote"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithAlignment">
<actionGroup name="ValidateAdvancedStyleWithAlignmentActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault"/>
Expand All @@ -177,7 +177,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithNoAlignment">
<actionGroup name="ValidateAdvancedStyleWithNoAlignmentActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
Expand All @@ -197,7 +197,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithNoAlignmentEmptyBorderRadius">
<actionGroup name="ValidateAdvancedStyleWithNoAlignmentEmptyBorderRadiusActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
Expand All @@ -217,7 +217,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithNoAlignmentNotVisible">
<actionGroup name="ValidateAdvancedStyleWithNoAlignmentNotVisibleActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
Expand Down Expand Up @@ -246,7 +246,7 @@
<waitForElement selector="{{page.padding(index, padding.value)}}" stepKey="waitForPadding"/>
<dontSeeElement selector="{{page.padding(index, padding.value)}}" stepKey="dontSeePadding"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithNoBorder">
<actionGroup name="ValidateAdvancedStyleWithNoBorderActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
Expand All @@ -264,7 +264,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithBorderColor">
<actionGroup name="ValidateAdvancedStyleWithBorderColorActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
Expand All @@ -285,7 +285,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithNoBorderWidth">
<actionGroup name="ValidateAdvancedStyleWithNoBorderWidthActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault"/>
Expand All @@ -305,7 +305,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithNoBorderRadius">
<actionGroup name="ValidateAdvancedStyleWithNoBorderRadiusActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
Expand All @@ -324,7 +324,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithCssClasses">
<actionGroup name="ValidateAdvancedStyleWithCssClassesActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
Expand All @@ -345,7 +345,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithNoMargins">
<actionGroup name="ValidateAdvancedStyleWithNoMarginsActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
Expand All @@ -364,7 +364,7 @@
<waitForElementVisible selector="{{page.noMargins(index)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithNoPadding">
<actionGroup name="ValidateAdvancedStyleWithNoPaddingActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
Expand All @@ -383,7 +383,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.noPadding(index)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithAllUpdated">
<actionGroup name="ValidateAdvancedStyleWithAllUpdatedActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault"/>
Expand All @@ -406,7 +406,7 @@
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
</actionGroup>
<actionGroup name="validateAdvancedStyleWithAllUpdatedNotVisible">
<actionGroup name="ValidateAdvancedStyleWithAllUpdatedNotVisibleActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault"/>
Expand Down Expand Up @@ -438,14 +438,14 @@
<waitForElement selector="{{page.padding(index, padding.value)}}" stepKey="waitForPadding"/>
<dontSeeElement selector="{{page.padding(index, padding.value)}}" stepKey="dontSeePadding"/>
</actionGroup>
<actionGroup name="validateTextAlignment">
<actionGroup name="ValidateTextAlignmentActionGroup">
<arguments>
<argument name="property" defaultValue=""/>
</arguments>
<waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible" />
<seeElement selector="//li[@name='{{property.value}}' and contains(@class,'active')]" stepKey="alignmentIsSelected" />
</actionGroup>
<actionGroup name="validateAdvancedStyleWithNoConfiguration">
<actionGroup name="ValidateAdvancedStyleWithNoConfigurationActionGroup">
<arguments>
<argument name="page" defaultValue=""/>
<argument name="index" defaultValue="1" type="string"/>
Expand Down
Loading