Skip to content

Commit fbfbdd7

Browse files
author
Hwashiang Yu
committed
Merge branch 'MC-961-same-width-buttons' into cms-team-2-sprint-14
2 parents d84e175 + 916806a commit fbfbdd7

File tree

15 files changed

+1265
-165
lines changed

15 files changed

+1265
-165
lines changed

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

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
<comment userInput="inlineEditButton" stepKey="comment"/>
5252
<waitForElementVisible selector="{{ButtonItemOnStage.base(index)}}" stepKey="waitForButton"/>
5353
<waitForElementVisible selector="{{ButtonItemOnStage.editableButtonItemElement(index)}}" stepKey="waitForButtonEditable"/>
54-
<pressKey selector="{{ButtonItemOnStage.editableButtonItemElement(index)}}" userInput="{{text.value}}" stepKey="enterButtonText"/>
54+
<fillField selector="{{ButtonItemOnStage.editableButtonItemElement(index)}}" userInput="{{text.value}}" stepKey="enterButtonText"/>
5555
<waitForElementVisible selector="{{ButtonItemOnStage.buttonItemText(index, text.value)}}" stepKey="waitForButtonText"/>
56-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusLiveEdit"/>
57-
<waitForPageLoad stepKey="waitForUnfocus"/>
56+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusLiveEdit"/>
57+
<waitForPageLoad stepKey="waitForUnFocus"/>
5858
</actionGroup>
5959
<actionGroup name="moveButton">
6060
<arguments>
@@ -80,6 +80,7 @@
8080
<argument name="firstButtonIndex" defaultValue="1" type="string"/>
8181
<argument name="secondButtonIndex" defaultValue="2" type="string"/>
8282
</arguments>
83+
<comment userInput="validateButtonGroupInlineAppearance" stepKey="comment"/>
8384
<waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupindex)}}" stepKey="waitForButtonGroup"/>
8485
<waitForElementVisible selector="{{buttonGroupPage.appearance(buttonGroupindex, PageBuilderButtonGroupAppearance_Inline.value)}}" stepKey="seeButtonAppearance"/>
8586
<waitForElementVisible selector="{{buttonItemPage.base(firstButtonIndex)}}" stepKey="waitForButton1"/>
@@ -105,6 +106,7 @@
105106
<argument name="firstButtonIndex" defaultValue="1" type="string"/>
106107
<argument name="secondButtonIndex" defaultValue="2" type="string"/>
107108
</arguments>
109+
<comment userInput="validateButtonGroupInlineAppearanceWraps" stepKey="comment"/>
108110
<waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupindex)}}" stepKey="waitForButtonGroup"/>
109111
<waitForElementVisible selector="{{buttonGroupPage.appearance(buttonGroupindex, PageBuilderButtonGroupAppearance_Inline.value)}}" stepKey="seeButtonAppearance"/>
110112
<waitForElementVisible selector="{{buttonItemPage.base(firstButtonIndex)}}" stepKey="waitForButton1"/>
@@ -126,12 +128,13 @@
126128
<arguments>
127129
<argument name="buttonGroupPage"/>
128130
<argument name="buttonItemPage"/>
129-
<argument name="buttonGroupindex" defaultValue="1" type="string"/>
131+
<argument name="buttonGroupIndex" defaultValue="1" type="string"/>
130132
<argument name="firstButtonIndex" defaultValue="1" type="string"/>
131133
<argument name="secondButtonIndex" defaultValue="2" type="string"/>
132134
</arguments>
133-
<waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupindex)}}" stepKey="waitForButtonGroup"/>
134-
<waitForElementVisible selector="{{buttonGroupPage.appearance(buttonGroupindex, PageBuilderButtonGroupAppearance_Stacked.value)}}" stepKey="seeButtonAppearance"/>
135+
<comment userInput="validateButtonGroupStackedAppearance" stepKey="comment"/>
136+
<waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupIndex)}}" stepKey="waitForButtonGroup"/>
137+
<waitForElementVisible selector="{{buttonGroupPage.appearance(buttonGroupIndex, PageBuilderButtonGroupAppearance_Stacked.value)}}" stepKey="seeButtonAppearance"/>
135138
<waitForElementVisible selector="{{buttonItemPage.base(firstButtonIndex)}}" stepKey="waitForButton1"/>
136139
<executeJS function="return {{buttonItemPage.jsButtonSelector(firstButtonIndex)}}.getBoundingClientRect().x" stepKey="xCoordinate1"/>
137140
<executeJS function="return {{buttonItemPage.jsButtonSelector(firstButtonIndex)}}.getBoundingClientRect().y" stepKey="yCoordinate1"/>
@@ -147,4 +150,36 @@
147150
<actualResult type="variable">yCoordinate2</actualResult>
148151
</assertGreaterThan>
149152
</actionGroup>
153+
<actionGroup name="validateButtonItemsSameSize">
154+
<arguments>
155+
<argument name="buttonGroupPage"/>
156+
<argument name="buttonItemPage"/>
157+
<argument name="buttonGroupIndex" defaultValue="1" type="string"/>
158+
<argument name="firstButtonIndex" defaultValue="1" type="string"/>
159+
<argument name="secondButtonIndex" defaultValue="2" type="string"/>
160+
</arguments>
161+
<comment userInput="validateButtonItemsSameSize" stepKey="comment"/>
162+
<waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupIndex)}}" stepKey="waitForButtonGroup"/>
163+
<seeElement selector="{{buttonGroupPage.sameSizeValue(buttonGroupIndex, PageBuilderButtonGroupSameSize_Enabled.value)}}" stepKey="seeButtonSameSizeValue"/>
164+
<waitForElementVisible selector="{{buttonItemPage.base(firstButtonIndex)}}" stepKey="waitForButton1"/>
165+
<executeJS function="return parseInt(window.getComputedStyle({{buttonItemPage.jsButtonSelector(firstButtonIndex)}}).width)" stepKey="button1Width"/>
166+
<waitForElementVisible selector="{{buttonItemPage.base(secondButtonIndex)}}" stepKey="waitForButton2"/>
167+
<executeJS function="return parseInt(window.getComputedStyle({{buttonItemPage.jsButtonSelector(secondButtonIndex)}}).width)" stepKey="button2Width"/>
168+
<assertGreaterThan stepKey="assertButtonWidthGreaterThanZero">
169+
<actualResult type="variable">button1Width</actualResult>
170+
<expectedResult type="int">0</expectedResult>
171+
</assertGreaterThan>
172+
<assertEquals stepKey="assertButtonWidthSize">
173+
<actualResult type="variable">button1Width</actualResult>
174+
<expectedResult type="variable">button2Width</expectedResult>
175+
</assertEquals>
176+
</actionGroup>
177+
<actionGroup name="validateButtonItemsDifferentSizes" extends="validateButtonItemsSameSize">
178+
<comment userInput="validateButtonItemsDifferentSizes" stepKey="comment"/>
179+
<seeElement selector="{{buttonGroupPage.sameSizeValue(buttonGroupIndex, PageBuilderButtonGroupSameSize_Disabled.value)}}" stepKey="seeButtonSameSizeValue"/>
180+
<assertNotEquals stepKey="assertButtonWidthSize">
181+
<actualResult type="variable">button1Width</actualResult>
182+
<expectedResult type="variable">button2Width</expectedResult>
183+
</assertNotEquals>
184+
</actionGroup>
150185
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/ButtonGroupData.xml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,28 @@
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11-
<!-- Button Group Appearance -->
12-
<entity name="PageBuilderButtonGroupAppearance_Inline" type="pagebuilder_button_group_appearance">
13-
<data key="name">Appearance</data>
14-
<data key="section">appearance_fieldset</data>
15-
<data key="fieldName">appearance</data>
16-
<data key="value">inline</data>
17-
</entity>
18-
<entity name="PageBuilderButtonGroupAppearance_Stacked" type="pagebuilder_button_group_appearance">
19-
<data key="name">Appearance</data>
20-
<data key="section">appearance_fieldset</data>
21-
<data key="fieldName">appearance</data>
22-
<data key="value">stacked</data>
23-
</entity>
11+
<!-- Button Group Appearance -->
12+
<entity name="PageBuilderButtonGroupAppearance_Template" type="pagebuilder_button_group_appearance">
13+
<data key="name">Appearance</data>
14+
<data key="section">appearance_fieldset</data>
15+
<data key="fieldName">appearance</data>
16+
</entity>
17+
<entity name="PageBuilderButtonGroupAppearance_Inline" type="pagebuilder_button_group_appearance" extends="PageBuilderButtonGroupAppearance_Template">
18+
<data key="value">inline</data>
19+
</entity>
20+
<entity name="PageBuilderButtonGroupAppearance_Stacked" type="pagebuilder_button_group_appearance" extends="PageBuilderButtonGroupAppearance_Template">
21+
<data key="value">stacked</data>
22+
</entity>
23+
<!-- Buttons Same Size -->
24+
<entity name="PageBuilderButtonGroupSameSize_Template" type="pagebuilder_button_group_same_size">
25+
<data key="name">All Buttons are same size</data>
26+
<data key="section">appearance_fieldset</data>
27+
<data key="fieldName">same_width</data>
28+
</entity>
29+
<entity name="PageBuilderButtonGroupSameSize_Enabled" type="pagebuilder_button_group_same_size" extends="PageBuilderButtonGroupSameSize_Template">
30+
<data key="value">1</data>
31+
</entity>
32+
<entity name="PageBuilderButtonGroupSameSize_Disabled" type="pagebuilder_button_group_same_size" extends="PageBuilderButtonGroupSameSize_Template">
33+
<data key="value">0</data>
34+
</entity>
2435
</entities>

0 commit comments

Comments
 (0)