Skip to content

Commit ba8ef5e

Browse files
danmooney2danmooney2
committed
MC-5474: Anchor tag name is used on banner/slide/image wrapper when no link is specified by admin
Change all executeJS storefront button width assertions to use ButtonItemOnStorefrontEmptyLink section
1 parent e1d6c8f commit ba8ef5e

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@
969969
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
970970
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
971971
</actionGroup>
972-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront1"/>
972+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront1"/>
973973
<!-- Edit Button: Make Largest Button Larger -->
974974
<comment userInput="Edit Button: Make Largest Button Larger" stepKey="commentEdit1"/>
975975
<switchToPreviousTab stepKey="switchToPreviousTab"/>
@@ -1001,7 +1001,7 @@
10011001
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
10021002
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
10031003
</actionGroup>
1004-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront2"/>
1004+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront2"/>
10051005
<assertGreaterThan stepKey="assertButtonWidthLargerThanInitialStorefront">
10061006
<actualResult type="variable">button1WidthStorefront2</actualResult>
10071007
<expectedResult type="variable">button1WidthStorefront1</expectedResult>
@@ -1037,7 +1037,7 @@
10371037
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
10381038
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
10391039
</actionGroup>
1040-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront3"/>
1040+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront3"/>
10411041
<assertLessThan stepKey="assertButtonWidthSmallerThanInitialStorefront">
10421042
<actualResult type="variable">button1WidthStorefront3</actualResult>
10431043
<expectedResult type="variable">button1WidthStorefront1</expectedResult>
@@ -1073,7 +1073,7 @@
10731073
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
10741074
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
10751075
</actionGroup>
1076-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront4"/>
1076+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront4"/>
10771077
<assertEquals stepKey="assertButtonWidthUnchangedStorefront">
10781078
<actualResult type="variable">button1WidthStorefront4</actualResult>
10791079
<expectedResult type="variable">button1WidthStorefront3</expectedResult>
@@ -1109,7 +1109,7 @@
11091109
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
11101110
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
11111111
</actionGroup>
1112-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront5"/>
1112+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront5"/>
11131113
<assertEquals stepKey="assertButtonWidthSameAsInitialStorefront">
11141114
<actualResult type="variable">button1WidthStorefront5</actualResult>
11151115
<expectedResult type="variable">button1WidthStorefront1</expectedResult>
@@ -1184,7 +1184,7 @@
11841184
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
11851185
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
11861186
</actionGroup>
1187-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront1"/>
1187+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront1"/>
11881188
<!-- Add New Longest Button -->
11891189
<comment userInput="Add New Longest Button" stepKey="commentAddNewButton"/>
11901190
<switchToPreviousTab stepKey="switchToPreviousTab"/>
@@ -1227,7 +1227,7 @@
12271227
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
12281228
<argument name="secondButtonIndex" value="3"/>
12291229
</actionGroup>
1230-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront2"/>
1230+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront2"/>
12311231
<assertGreaterThan stepKey="assertButtonWidthStorefront">
12321232
<actualResult type="variable">button1WidthStorefront2</actualResult>
12331233
<expectedResult type="variable">button1WidthStorefront1</expectedResult>
@@ -1302,7 +1302,7 @@
13021302
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
13031303
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
13041304
</actionGroup>
1305-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront1"/>
1305+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront1"/>
13061306
<!-- Update Button Border Width -->
13071307
<comment userInput="Update Button Border Width" stepKey="commentUpdateButton"/>
13081308
<switchToPreviousTab stepKey="switchToPreviousTab"/>
@@ -1338,7 +1338,7 @@
13381338
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
13391339
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
13401340
</actionGroup>
1341-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront2"/>
1341+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront2"/>
13421342
<assertGreaterThan stepKey="assertButtonWidthStorefront">
13431343
<actualResult type="variable">button1WidthStorefront2</actualResult>
13441344
<expectedResult type="variable">button1WidthStorefront1</expectedResult>
@@ -1376,7 +1376,7 @@
13761376
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
13771377
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
13781378
</actionGroup>
1379-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront3"/>
1379+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront3"/>
13801380
<assertGreaterThan stepKey="assertButtonWidthStorefront2">
13811381
<actualResult type="variable">button1WidthStorefront3</actualResult>
13821382
<expectedResult type="variable">button1WidthStorefront2</expectedResult>
@@ -1414,7 +1414,7 @@
14141414
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
14151415
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
14161416
</actionGroup>
1417-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront4"/>
1417+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="button1WidthStorefront4"/>
14181418
<assertGreaterThan stepKey="assertButtonWidthStorefront3">
14191419
<actualResult type="variable">button1WidthStorefront4</actualResult>
14201420
<expectedResult type="variable">button1WidthStorefront3</expectedResult>
@@ -1737,7 +1737,7 @@
17371737
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
17381738
</actionGroup>
17391739
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('1')}}')).width)" stepKey="columnWidthStorefront"/>
1740-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront"/>
1740+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront"/>
17411741
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefront">
17421742
<expectedResult type="variable">$columnWidthStorefront</expectedResult>
17431743
<actualResult type="variable">$buttonWidthStorefront</actualResult>
@@ -1750,7 +1750,7 @@
17501750
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
17511751
</actionGroup>
17521752
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('1')}}')).width)" stepKey="columnWidthStorefrontMobile"/>
1753-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile"/>
1753+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile"/>
17541754
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefrontMobile">
17551755
<expectedResult type="variable">$columnWidthStorefrontMobile</expectedResult>
17561756
<actualResult type="variable">$buttonWidthStorefrontMobile</actualResult>
@@ -1795,7 +1795,7 @@
17951795
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
17961796
</actionGroup>
17971797
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('1')}}')).width)" stepKey="columnWidthStorefront2"/>
1798-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront2"/>
1798+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront2"/>
17991799
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefront2">
18001800
<expectedResult type="variable">$columnWidthStorefront2</expectedResult>
18011801
<actualResult type="variable">$buttonWidthStorefront2</actualResult>
@@ -1808,7 +1808,7 @@
18081808
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
18091809
</actionGroup>
18101810
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('1')}}')).width)" stepKey="columnWidthStorefrontMobile2"/>
1811-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile2"/>
1811+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile2"/>
18121812
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefrontMobile2">
18131813
<expectedResult type="variable">$columnWidthStorefrontMobile</expectedResult>
18141814
<actualResult type="variable">$buttonWidthStorefrontMobile</actualResult>
@@ -1848,7 +1848,7 @@
18481848
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
18491849
</actionGroup>
18501850
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('2')}}')).width)" stepKey="columnWidthStorefront3"/>
1851-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront3"/>
1851+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront3"/>
18521852
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefront3">
18531853
<expectedResult type="variable">$columnWidthStorefront3</expectedResult>
18541854
<actualResult type="variable">$buttonWidthStorefront3</actualResult>
@@ -1861,7 +1861,7 @@
18611861
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
18621862
</actionGroup>
18631863
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('2')}}')).width)" stepKey="columnWidthStorefrontMobile3"/>
1864-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile3"/>
1864+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile3"/>
18651865
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefrontMobile3">
18661866
<expectedResult type="variable">$columnWidthStorefrontMobile</expectedResult>
18671867
<actualResult type="variable">$buttonWidthStorefrontMobile</actualResult>
@@ -1990,7 +1990,7 @@
19901990
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
19911991
</actionGroup>
19921992
<executeJS function="return document.querySelectorAll('{{TabOnStorefront.all}}')[0].offsetWidth" stepKey="tabWidthStorefront"/>
1993-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront"/>
1993+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront"/>
19941994
<assertLessThan stepKey="assertButtonSmallerThanTabStorefront">
19951995
<expectedResult type="variable">$tabWidthStorefront</expectedResult>
19961996
<actualResult type="variable">$buttonWidthStorefront</actualResult>
@@ -2003,7 +2003,7 @@
20032003
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
20042004
</actionGroup>
20052005
<executeJS function="return document.querySelectorAll('{{TabOnStorefront.all}}')[0].offsetWidth" stepKey="tabWidthStorefrontMobile"/>
2006-
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefront.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile"/>
2006+
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile"/>
20072007
<assertLessThan stepKey="assertButtonSmallerThanTabStorefrontMobile">
20082008
<expectedResult type="variable">$tabWidthStorefrontMobile</expectedResult>
20092009
<actualResult type="variable">$buttonWidthStorefrontMobile</actualResult>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403
<argument name="text" value="PageBuilderButtonItemText_200Characters"/>
404404
</actionGroup>
405405
<!-- Get Width Of Button on Store Front -->
406-
<executeJS function="return Math.round({{ButtonItemOnStorefront.jsButtonSelector('1')}}.clientWidth)" stepKey="buttonWidthStoreFront"/>
406+
<executeJS function="return Math.round({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}.clientWidth)" stepKey="buttonWidthStoreFront"/>
407407
<comment userInput="buttonWidthStoreFront: $buttonWidthStoreFront" stepKey="commentButtonWidthStoreFront"/>
408408
<!-- Get Width Of Button Group on Store Front -->
409409
<executeJS function="return Math.round({{ButtonGroupOnStorefront.jsButtonGroupSelector('1')}}.clientWidth)" stepKey="buttonGroupWidthStoreFront"/>

0 commit comments

Comments
 (0)