Skip to content

Commit e0e8312

Browse files
tjwiebelltjwiebell
committed
MAGETWO-92409: [Jenkins] MFTF Failures After Merge
- Update ButtomItem test to use correct Section and resolve issues with selectors - Update Buttons default test to work with new required Appearance
1 parent e45e5a6 commit e0e8312

File tree

3 files changed

+18
-27
lines changed

3 files changed

+18
-27
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
<!-- Advanced Configuration -->
1717
<element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}][@style='border: {{arg2}}; border-radius: {{arg3}}px; margin: {{arg4}}px; padding: {{arg5}}px;']" parameterized="true"/>
1818
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
19-
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[not(contains(@style,'text-align:'))]" parameterized="true"/>
19+
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@class, 'buttons-container')][not(contains(@style,'text-align:'))]" parameterized="true"/>
2020
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
2121
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
22-
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[not(contains(@style,'border-color:'))]" parameterized="true"/>
22+
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@class, 'buttons-container')][not(contains(@style,'border-color:'))]" parameterized="true"/>
2323
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
2424
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
2525
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@class,'{{arg2}}')]" parameterized="true"/>
26-
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[not(@class)]" parameterized="true"/>
26+
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]" parameterized="true"/>
2727
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
2828
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
2929
</section>
@@ -57,11 +57,14 @@
5757
<!-- Advanced Configuration -->
5858
<element name="defaultStyle" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][@style='cursor: text;']" parameterized="true"/>
5959
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
60+
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@style,'text-align:'))]" parameterized="true"/>
6061
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
6162
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
63+
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@style,'border-color:'))]" parameterized="true"/>
6264
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
6365
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
6466
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@class,'{{arg2}}'))]" parameterized="true"/>
67+
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')]" parameterized="true"/>
6568
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
6669
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
6770
</section>
@@ -78,11 +81,14 @@
7881
<!-- Advanced Configuration -->
7982
<element name="defaultStyle" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(@style)]" parameterized="true"/>
8083
<element name="alignment" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
84+
<element name="noAlignment" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'text-align:'))]" parameterized="true"/>
8185
<element name="border" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
8286
<element name="borderColor" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
87+
<element name="noBorderColor" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'border-color:'))]" parameterized="true"/>
8388
<element name="borderWidth" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
8489
<element name="borderRadius" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
8590
<element name="cssClasses" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@class,'{{arg2}}'))]" parameterized="true"/>
91+
<element name="noCssClasses" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]" parameterized="true"/>
8692
<element name="margins" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
8793
<element name="padding" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
8894
</section>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTests.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@
5757
</actionGroup>
5858
<dontSeeElementInDOM selector="{{ButtonGroupOnStorefront.base('1')}}" stepKey="dontSeeButtonsStorefront"/>
5959
</test>
60-
<test name="ButtonGroupNoRequiredAttributes">
60+
<test name="ButtonGroupRequiredAttributes">
6161
<annotations>
6262
<features value="Pagebuilder"/>
6363
<stories value="Button Group"/>
64-
<title value="Button Group - Validate No Required Attributes"/>
65-
<description value="A user should be able to save a Button Group edit form without inputting data into any attribute field."/>
64+
<title value="Button Group - Validate Required Attributes"/>
65+
<description value="A user should be able to save a Button Group edit form without inputting data into any required field."/>
6666
<severity value="AVERAGE"/>
6767
<useCaseId value="MAGETWO-90473"/>
6868
<testCaseId value="MAGETWO-92014"/>
@@ -84,9 +84,10 @@
8484
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
8585
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
8686
</actionGroup>
87-
<!-- Validate No Required Fields -->
88-
<comment userInput="Validate No Required Fields" stepKey="commentValidateNoRequired"/>
89-
<dontSeeElementInDOM selector="{{PageBuilderActionsSection.editFormAllRequiredFields}}" stepKey="dontSeeRequiredClassInEditForm"/>
87+
<!-- Validate Required Fields -->
88+
<comment userInput="Validate Required Fields" stepKey="commentValidateRequired"/>
89+
<waitForElementVisible selector="{{PageBuilderActionsSection.editFormAllRequiredFields}}" stepKey="waitForRequiredClassInEditForm"/>
90+
<seeNumberOfElements selector="{{PageBuilderActionsSection.editFormAllRequiredFields}}" userInput="1" stepKey="seeNumberOfRequiredElements"/>
9091
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
9192
<waitForElementVisible time="10" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForCmsPageSaveButton"/>
9293
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTests.xml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -621,15 +621,7 @@
621621
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
622622
<!-- Validate Stage After Save -->
623623
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
624-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage2">
625-
<argument name="page" value="ButtonGroupOnStage"/>
626-
<argument name="border" value="PageBuilderAdvancedBorderPropertyNone"/>
627-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
628-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
629-
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
630-
<argument name="padding" value="PageBuilderPaddingPropertyButtons"/>
631-
<argument name="index" value="1"/>
632-
</actionGroup>
624+
<waitForElementVisible selector="{{ButtonItemOnStage.base('1')}}[@style='cursor: text;']" stepKey="waitForDefaultButtonOnStage"/>
633625
<!-- Validate Edit Panel After Save -->
634626
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
635627
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -665,15 +657,7 @@
665657
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
666658
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
667659
</actionGroup>
668-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefront">
669-
<argument name="page" value="ButtonGroupOnStorefront"/>
670-
<argument name="border" value="PageBuilderAdvancedBorderPropertyNone"/>
671-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
672-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
673-
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
674-
<argument name="padding" value="PageBuilderPaddingPropertyButtons"/>
675-
<argument name="index" value="1"/>
676-
</actionGroup>
660+
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}[@style='display: inline-block;']" stepKey="waitForDefaultButtonOnStorefront"/>
677661
</test>
678662
<test name="ButtonItemUpdateAdvancedConfigurationValues">
679663
<annotations>

0 commit comments

Comments
 (0)