Skip to content

Commit abd7ea8

Browse files
danmooney2danmooney2
committed
MC-5474: Anchor tag name is used on banner/slide/image wrapper when no link is specified by admin
Update button item tests
1 parent 0dec73a commit abd7ea8

File tree

5 files changed

+54
-34
lines changed

5 files changed

+54
-34
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,6 @@
4444
<waitForElementVisible selector="{{page.buttonItemUrl(index, url.value)}}" stepKey="waitForButtonUrl"/>
4545
<waitForElementVisible selector="{{page.buttonItemNewTab(index, newTab.stageValue)}}" stepKey="waitForButtonNewTab"/>
4646
</actionGroup>
47-
<actionGroup name="validateButtonItemEmptyLinkContent">
48-
<arguments>
49-
<argument name="page"/>
50-
<argument name="text" defaultValue="PageBuilderButtonItemText_Empty"/>
51-
<argument name="type" defaultValue="PageBuilderButtonItemType_Primary"/>
52-
<argument name="index" defaultValue="1" type="string"/>
53-
</arguments>
54-
<comment userInput="validateButtonItemEmptyLinkContent" stepKey="comment"/>
55-
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForButtonElement"/>
56-
<waitForElementVisible selector="{{page.buttonItemText(index, text.value)}}" stepKey="waitForButtonText"/>
57-
<waitForElementVisible selector="{{page.buttonItemType(index, type.value)}}" stepKey="waitForButtonType"/>
58-
<waitForElementVisible selector="{{page.buttonItemEmptyLinkUrl(index)}}" stepKey="waitForButtonEmptyLinkUrl"/>
59-
</actionGroup>
6047
<actionGroup name="inlineEditButton">
6148
<arguments>
6249
<argument name="text"/>

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

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,13 @@
9494
<element name="base" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]" parameterized="true"/>
9595
<element name="hidden" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
9696
<element name="notHidden" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
97-
<element name="emptyButtonItemElement" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a//span[not(text())]" parameterized="true"/>
97+
<element name="emptyButtonItemElement" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@data-element='link']//span[not(text())]" parameterized="true"/>
9898
<element name="jsButtonSelector" type="text" selector="document.querySelectorAll('div[data-role=\'button-item\'] [data-element=\'link\']')[{{arg1}}-1]" parameterized="true"/>
9999
<!-- Content Configuration -->
100100
<element name="buttonItemText" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//span[@data-element='link_text' and contains(.,'{{arg2}}')]" parameterized="true"/>
101101
<element name="buttonItemTextByButtonGroup" type="button" selector="((//div[@data-role='buttons'])[{{arg1}}]//div[@data-role='button-item'])[{{arg2}}]//span[@data-element='link_text' and contains(.,'{{arg3}}')]" parameterized="true"/>
102102
<element name="buttonItemType" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@class='{{arg2}}']" parameterized="true"/>
103103
<element name="buttonItemUrl" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@href='{{arg2}}']" parameterized="true"/>
104-
<element name="buttonItemEmptyLinkUrl" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='link'][not(@href) and not(@target)]" parameterized="true"/>
105104
<element name="buttonItemNewTab" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@target='{{arg2}}']" parameterized="true"/>
106105
<!-- Advanced Configuration -->
107106
<element name="defaultStyle" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(@style)]" parameterized="true"/>
@@ -122,4 +121,36 @@
122121
<element name="padding" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
123122
<element name="noPadding" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'padding:'))]" parameterized="true"/>
124123
</section>
124+
<section name="ButtonItemOnStorefrontEmptyLink">
125+
<element name="all" type="button" selector="[data-role='button-item']"/>
126+
<element name="base" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]" parameterized="true"/>
127+
<element name="hidden" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
128+
<element name="notHidden" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
129+
<element name="emptyButtonItemElement" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)]//span[not(text())]" parameterized="true"/>
130+
<element name="jsButtonSelector" type="text" selector="document.querySelectorAll('div[data-role=\'button-item\'] [data-element=\'empty_link\']')[{{arg1}}-1]" parameterized="true"/>
131+
<!-- Content Configuration -->
132+
<element name="buttonItemText" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//span[@data-element='link_text' and contains(.,'{{arg2}}')]" parameterized="true"/>
133+
<element name="buttonItemTextByButtonGroup" type="button" selector="((//div[@data-role='buttons'])[{{arg1}}]//div[@data-role='button-item'])[{{arg2}}]//span[@data-element='link_text' and contains(.,'{{arg3}}')]" parameterized="true"/>
134+
<element name="buttonItemType" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@class='{{arg2}}']" parameterized="true"/>
135+
<element name="buttonItemUrl" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(@href='{{arg2}}')]" parameterized="true"/>
136+
<element name="buttonItemNewTab" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(@target='{{arg2}}')]" parameterized="true"/>
137+
<!-- Advanced Configuration -->
138+
<element name="defaultStyle" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(@style)]" parameterized="true"/>
139+
<element name="alignment" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
140+
<element name="noAlignment" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(contains(@style,'text-align:'))]" parameterized="true"/>
141+
<element name="border" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
142+
<element name="noBorder" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(contains(@style,'border-style:'))]" parameterized="true"/>
143+
<element name="borderColor" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
144+
<element name="noBorderColor" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(contains(@style,'border-color:'))]" parameterized="true"/>
145+
<element name="borderWidth" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
146+
<element name="noBorderWidth" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(contains(@style,'border-width:'))]" parameterized="true"/>
147+
<element name="borderRadius" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
148+
<element name="noBorderRadius" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(contains(@style,'border-radius:'))]" parameterized="true"/>
149+
<element name="cssClasses" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}][contains(@class,'{{arg2}}')]//div[@data-element='empty_link'][not(@href) and not(@target)]" parameterized="true"/>
150+
<element name="noCssClasses" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]" parameterized="true"/>
151+
<element name="margins" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
152+
<element name="noMargins" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(contains(@style,'margin:'))]" parameterized="true"/>
153+
<element name="padding" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
154+
<element name="noPadding" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='empty_link'][not(@href) and not(@target)][not(contains(@style,'padding:'))]" parameterized="true"/>
155+
</section>
125156
</sections>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@
382382
<argument name="index" value="3"/>
383383
</actionGroup>
384384
<!-- 2nd Button -->
385-
<actionGroup ref="validateButtonItemEmptyLinkContent" stepKey="validateButton2Storefront">
386-
<argument name="page" value="ButtonItemOnStorefront"/>
385+
<actionGroup ref="validateButtonItemContent" stepKey="validateButton2Storefront">
386+
<argument name="page" value="ButtonItemOnStorefrontEmptyLink"/>
387387
<argument name="text" value="PageBuilderButtonItemText_Second"/>
388388
<argument name="index" value="4"/>
389389
</actionGroup>

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
8383
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
8484
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="waitForButtonTypeStorefront"/>
85-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemEmptyLinkUrl('1')}}" stepKey="waitForButtonEmptyLinkUrlStorefront"/>
85+
<waitForElementVisible selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemUrl('1', '')}}" stepKey="waitForButtonUrlStorefront"/>
86+
<waitForElementVisible selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
8687
</test>
8788
<test name="ButtonItemOneCharacterButtonText">
8889
<annotations>
@@ -155,8 +156,9 @@
155156
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
156157
<argument name="contentType" value="PageBuilderButtonsContentType"/>
157158
</actionGroup>
158-
<actionGroup ref="validateButtonItemEmptyLinkContent" stepKey="validateStorefront">
159-
<argument name="page" value="ButtonItemOnStorefront"/>
159+
<!-- TODO -->
160+
<actionGroup ref="validateButtonItemContent" stepKey="validateStorefront">
161+
<argument name="page" value="ButtonItemOnStorefrontEmptyLink"/>
160162
<argument name="text" value="PageBuilderButtonItemText_OneCharacter"/>
161163
</actionGroup>
162164
</test>
@@ -231,8 +233,8 @@
231233
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
232234
<argument name="contentType" value="PageBuilderButtonsContentType"/>
233235
</actionGroup>
234-
<actionGroup ref="validateButtonItemEmptyLinkContent" stepKey="validateStorefront">
235-
<argument name="page" value="ButtonItemOnStorefront"/>
236+
<actionGroup ref="validateButtonItemContent" stepKey="validateStorefront">
237+
<argument name="page" value="ButtonItemOnStorefrontEmptyLink"/>
236238
<argument name="text" value="PageBuilderButtonItemText_CommonCharacters"/>
237239
</actionGroup>
238240
</test>
@@ -308,8 +310,8 @@
308310
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
309311
<argument name="contentType" value="PageBuilderButtonsContentType"/>
310312
</actionGroup>
311-
<actionGroup ref="validateButtonItemEmptyLinkContent" stepKey="validateStorefront">
312-
<argument name="page" value="ButtonItemOnStorefront"/>
313+
<actionGroup ref="validateButtonItemContent" stepKey="validateStorefront">
314+
<argument name="page" value="ButtonItemOnStorefrontEmptyLink"/>
313315
<argument name="text" value="PageBuilderButtonItemText_SpecialCharacters"/>
314316
</actionGroup>
315317
</test>
@@ -396,8 +398,8 @@
396398
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
397399
<argument name="contentType" value="PageBuilderButtonsContentType"/>
398400
</actionGroup>
399-
<actionGroup ref="validateButtonItemEmptyLinkContent" stepKey="validateStorefront">
400-
<argument name="page" value="ButtonItemOnStorefront"/>
401+
<actionGroup ref="validateButtonItemContent" stepKey="validateStorefront">
402+
<argument name="page" value="ButtonItemOnStorefrontEmptyLink"/>
401403
<argument name="text" value="PageBuilderButtonItemText_200Characters"/>
402404
</actionGroup>
403405
<!-- Get Width Of Button on Store Front -->
@@ -487,7 +489,7 @@
487489
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
488490
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
489491
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="waitForButtonTypeStorefront"/>
490-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemEmptyLinkUrl('1')}}" stepKey="waitForButtonEmptyLinkUrlStorefront"/>
492+
<waitForElementVisible selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemUrl('1', '')}}" stepKey="waitForButtonEmptyLinkUrlStorefront"/>
491493
</test>
492494
<test name="ButtonItemSecondaryButtonType">
493495
<annotations>
@@ -563,7 +565,7 @@
563565
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
564566
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
565567
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Secondary.value)}}" stepKey="waitForButtonTypeStorefront"/>
566-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemEmptyLinkUrl('1')}}" stepKey="waitForButtonEmptyLinkUrlStorefront"/>
568+
<waitForElementVisible selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemUrl('1', '')}}" stepKey="waitForButtonEmptyLinkUrlStorefront"/>
567569
</test>
568570
<test name="ButtonItemLinkButtonType">
569571
<annotations>
@@ -639,6 +641,6 @@
639641
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
640642
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
641643
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Link.value)}}" stepKey="waitForButtonTypeStorefront"/>
642-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemEmptyLinkUrl('1')}}" stepKey="waitForButtonEmptyLinkUrlStorefront"/>
644+
<waitForElementVisible selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemUrl('1', '')}}" stepKey="waitForButtonEmptyLinkUrlStorefront"/>
643645
</test>
644646
</tests>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
5151
<argument name="contentType" value="PageBuilderButtonsContentType"/>
5252
</actionGroup>
53-
<waitForElement selector="{{ButtonItemOnStorefront.emptyButtonItemElement('1')}}" stepKey="seeEmptyButtonOnStorefront"/>
53+
<waitForElement selector="{{ButtonItemOnStorefrontEmptyLink.emptyButtonItemElement('1')}}" stepKey="seeEmptyButtonOnStorefront"/>
5454
</test>
5555
<test name="AddButtonsContentTypeToCMSPage">
5656
<annotations>
@@ -858,7 +858,7 @@
858858
<!-- Validate Storefront -->
859859
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
860860
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
861-
<argument name="page" value="ButtonItemOnStorefront"/>
861+
<argument name="page" value="ButtonItemOnStorefrontEmptyLink"/>
862862
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyLeft"/>
863863
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
864864
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -973,7 +973,7 @@
973973
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
974974
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
975975
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="waitForButtonTypeStorefront"/>
976-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemEmptyLinkUrl('1')}}" stepKey="waitForButtonEmptyLinkUrlStorefront"/>
976+
<waitForElementVisible selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemUrl('1', '')}}" stepKey="waitForButtonEmptyLinkUrlStorefront"/>
977977
</test>
978978
<test name="ButtonItemEmptyLinkURLDoesNothingOnStorefront">
979979
<annotations>
@@ -1025,8 +1025,8 @@
10251025
</actionGroup>
10261026
<!-- Validate Storefront -->
10271027
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1028-
<seeElement selector="{{ButtonItemOnStorefront.buttonItemEmptyLinkUrl('1')}}" stepKey="seeButtonEmptyLinkUrlStorefront"/>
1029-
<click selector="{{ButtonItemOnStorefront.buttonItemEmptyLinkUrl('1')}}" stepKey="clickButtonEmptyLinkUrlStorefront" />
1028+
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemUrl('1', '')}}" stepKey="seeButtonEmptyLinkUrlStorefront"/>
1029+
<click selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemUrl('1', '')}}" stepKey="clickButtonEmptyLinkUrlStorefront" />
10301030
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccur" />
10311031
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}{{PageBuilderButtonItemContentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="seeThatCurrentUrlIsUnchanged" />
10321032
</test>

0 commit comments

Comments
 (0)