Skip to content

Commit c35f50f

Browse files
author
Cari Spruiell
authored
Merge pull request #144 from magento-obsessive-owls/cms-team-1-delivery
[Owls] PageBuilder Bug Fixes
2 parents 807624c + e8d3fcc commit c35f50f

File tree

101 files changed

+2864
-1532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2864
-1532
lines changed

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,23 @@
1919
<fillField selector="{{AdvancedForm.advancedMarginBottom}}" userInput="{{property.marginBottom}}" stepKey="fillMarginBottomField"/>
2020
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
2121
</actionGroup>
22+
<actionGroup name="fillSlideOutPanelSingleFieldMarginsOrPadding">
23+
<arguments>
24+
<argument name="field" type="string"/>
25+
<argument name="value" type="string"/>
26+
</arguments>
27+
<waitForElement selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" stepKey="waitForElement"/>
28+
<fillField selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" userInput="{{value}}" stepKey="fillFieldMarginOrPadding"/>
29+
</actionGroup>
30+
<actionGroup name="validateMarginsOrPaddingError">
31+
<arguments>
32+
<argument name="property"/>
33+
<argument name="errorMessage" type="string"/>
34+
</arguments>
35+
<waitForElementVisible selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="waitForSectionChangedIcon"/>
36+
<seeElement selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="seeElementSectionChangedIcon"/>
37+
<see userInput="{{errorMessage}}" selector="{{AdvancedForm.advancedMarginAndPaddingErrorMessage}}" stepKey="seeErrorMessage"/>
38+
</actionGroup>
2239
<actionGroup name="fillSlideOutPanelFieldPadding">
2340
<arguments>
2441
<argument name="property" defaultValue=""/>

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

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<waitForPageLoad stepKey="waitForPageLoad2"/>
1717
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
1818
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
19-
<waitForElementVisible selector="{{AddLocationForm.base}}" stepKey="waitForLocationMap"/>
20-
<waitForElementVisible selector="{{AddLocationForm.pegman('1')}}" stepKey="waitForLocationMapPegman"/>
19+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
20+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
2121
</actionGroup>
2222
<actionGroup name="saveLocationForm">
2323
<comment userInput="saveLocationForm" stepKey="comment"/>
@@ -46,8 +46,8 @@
4646
<waitForPageLoad stepKey="waitForPageLoad"/>
4747
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
4848
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
49-
<waitForElementVisible selector="{{AddLocationForm.base}}" stepKey="waitForLocationMap"/>
50-
<waitForElementVisible selector="{{AddLocationForm.pegman('1')}}" stepKey="waitForLocationMapPegman"/>
49+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
50+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
5151
</actionGroup>
5252
<actionGroup name="clickEditButtonOnLocationGrid">
5353
<arguments>
@@ -61,8 +61,8 @@
6161
<waitForPageLoad stepKey="waitForPageLoad"/>
6262
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
6363
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
64-
<waitForElementVisible selector="{{AddLocationForm.base}}" stepKey="waitForLocationMap"/>
65-
<waitForElementVisible selector="{{AddLocationForm.pegman('1')}}" stepKey="waitForLocationMapPegman"/>
64+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
65+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
6666
</actionGroup>
6767
<actionGroup name="deleteLocationFromGrid">
6868
<arguments>
@@ -104,6 +104,8 @@
104104
<argument name="x" defaultValue="null" type="string"/>
105105
<argument name="y" defaultValue="null" type="string"/>
106106
</arguments>
107+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
108+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
107109
<waitForElementVisible selector="{{AddLocationForm.base}}" stepKey="waitForMapVisible"/>
108110
<clickWithLeftButton selector="{{AddLocationForm.base}}" x="{{x}}" y="{{y}}" stepKey="clickMapToMovePin"/>
109111
<waitForElementVisible selector="{{AddLocationForm.pin}}" stepKey="waitForPinVisible"/>
@@ -114,6 +116,8 @@
114116
<argument name="x" defaultValue="null" type="string"/>
115117
<argument name="y" defaultValue="null" type="string"/>
116118
</arguments>
119+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
120+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
117121
<waitForElementVisible selector="{{AddLocationForm.clickablePin}}" stepKey="waitForMapVisible"/>
118122
<dragAndDrop selector1="{{AddLocationForm.clickablePin}}" selector2="{{AddLocationForm.clickablePin}}" x="{{x}}" y="{{y}}" stepKey="dragAndDropOnMapToMovePin"/>
119123
<wait time="2" stepKey="waitForPinMove"/>
@@ -123,6 +127,8 @@
123127
<argument name="page" defaultValue="MapOnStage"/>
124128
<argument name="index" defaultValue="1" type="string"/>
125129
</arguments>
130+
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
131+
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
126132
<waitForElementVisible selector="{{page.pin(index)}}" stepKey="waitForMapWithPin"/>
127133
</actionGroup>
128134
<actionGroup name="verifyNumberOfPinsOnMap">
@@ -131,6 +137,8 @@
131137
<argument name="mapIndex" defaultValue="1" type="string"/>
132138
<argument name="count" type="string"/>
133139
</arguments>
140+
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
141+
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
134142
<waitForElementVisible selector="{{page.base(mapIndex)}}" stepKey="waitForMap"/>
135143
<waitForElementVisible selector="{{page.pin(mapIndex)}}" stepKey="waitForMapPin"/>
136144
<seeNumberOfElements selector="{{page.pin(mapIndex)}}" userInput="{{count}}" stepKey="seeNumberOfPins"/>
@@ -140,6 +148,8 @@
140148
<argument name="page" defaultValue="MapOnStage"/>
141149
<argument name="index" defaultValue="1" type="string"/>
142150
</arguments>
151+
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
152+
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
143153
<dontSeeElement selector="{{page.pin(index)}}" stepKey="dontSeeMapPin"/>
144154
</actionGroup>
145155
<actionGroup name="validateMapButtons">
@@ -148,11 +158,10 @@
148158
<argument name="index" defaultValue="1" type="string"/>
149159
</arguments>
150160
<comment userInput="validateMapButtons" stepKey="comment"/>
161+
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
162+
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
151163
<waitForElementVisible selector="{{page.base(index)}}" stepKey="seeMap"/>
152164
<waitForElementVisible selector="{{page.fullScreen(index)}}" stepKey="waitForFullScreenButton"/>
153-
<waitForElementVisible selector="{{page.pegman(index)}}" stepKey="waitForMapPegman"/>
154-
<waitForElementVisible selector="{{page.satelliteView(index)}}" stepKey="waitForMapSatelliteView"/>
155-
<waitForElementVisible selector="{{page.streetView(index)}}" stepKey="waitForMapStreetView"/>
156165
<waitForElementVisible selector="{{page.zoomIn(index)}}" stepKey="waitForMapZoomIn"/>
157166
<waitForElementVisible selector="{{page.zoomOut(index)}}" stepKey="waitForMapZoomOut"/>
158167
</actionGroup>
@@ -162,12 +171,11 @@
162171
<argument name="index" defaultValue="1" type="string"/>
163172
</arguments>
164173
<comment userInput="validateNoMapButtons" stepKey="comment"/>
174+
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
175+
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
165176
<waitForElementVisible selector="{{page.base(index)}}" stepKey="seeMap"/>
166177
<waitForElement selector="{{page.fullScreen(index)}}" stepKey="waitForFullScreenButton"/>
167178
<dontSeeElement selector="{{page.fullScreen(index)}}" stepKey="dontSeeFullScreenButton"/>
168-
<dontSeeElementInDOM selector="{{page.allPegmen(index)}}" stepKey="dontSeeMapPegman"/>
169-
<dontSeeElementInDOM selector="{{page.satelliteView(index)}}" stepKey="dontSeeMapSatelliteView"/>
170-
<dontSeeElementInDOM selector="{{page.streetView(index)}}" stepKey="dontSeeMapStreetView"/>
171179
<dontSeeElementInDOM selector="{{page.zoomIn(index)}}" stepKey="dontSeeMapZoomIn"/>
172180
<dontSeeElementInDOM selector="{{page.zoomOut(index)}}" stepKey="dontSeeMapZoomOut"/>
173181
</actionGroup>
@@ -207,6 +215,8 @@
207215
<argument name="pinIndex" defaultValue="1" type="string"/>
208216
</arguments>
209217
<comment userInput="openMapPinTooltipWindow" stepKey="comment"/>
218+
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
219+
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
210220
<waitForElementVisible selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
211221
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
212222
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
@@ -217,6 +227,8 @@
217227
<argument name="mapIndex" defaultValue="1" type="string"/>
218228
</arguments>
219229
<comment userInput="closeMapPinTooltipWindow" stepKey="comment"/>
230+
<moveMouseOver selector="{{page.base(mapIndex)}}" x="-1" y="0" stepKey="moveMouseOutsideMap"/>
231+
<waitForPageLoad stepKey="waitForOptionMenuGone"/>
220232
<click selector="{{page.tooltipWindowClose(mapIndex)}}" stepKey="closePinTooltip"/>
221233
<waitForElementNotVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltipGone"/>
222234
</actionGroup>
@@ -235,18 +247,24 @@
235247
<argument name="pinIndex" defaultValue="1" type="string"/>
236248
</arguments>
237249
<comment userInput="validateMapPinLocationData" stepKey="comment1"/>
250+
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
251+
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
238252
<waitForElementVisible selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
239253
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
240254
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
241255
<waitForElementVisible selector="{{page.locationName(mapIndex, locationName.value)}}" stepKey="waitForLocationName"/>
242256
<waitForElementVisible selector="{{page.comment(mapIndex, comment.value)}}" stepKey="waitForComment"/>
243257
<waitForElementVisible selector="{{page.phoneNumber(mapIndex, phoneNumber.value)}}" stepKey="waitForPhoneNumber"/>
244258
<waitForElementVisible selector="{{page.addressCityStateZipCountry(mapIndex, address.value, city.value, state.tooltipValue, zip.value, country.tooltipValue)}}" stepKey="waitForAddress"/>
259+
<moveMouseOver selector="{{page.base(mapIndex)}}" x="-1" y="0" stepKey="moveMouseOutsideMap"/>
260+
<waitForPageLoad stepKey="waitForOptionMenuGone"/>
245261
<click selector="{{page.tooltipWindowClose(mapIndex)}}" stepKey="closePinTooltip"/>
246262
<waitForElementNotVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltipGone"/>
247263
</actionGroup>
248264
<actionGroup name="validateNoPinTooltip">
249265
<comment userInput="validateNoPinTooltip" stepKey="comment"/>
266+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
267+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
250268
<waitForElementVisible selector="{{AddLocationForm.clickablePin}}" stepKey="waitForPin"/>
251269
<click selector="{{AddLocationForm.clickablePin}}" stepKey="clickPin"/>
252270
<dontSeeElementInDOM selector="{{AddLocationForm.tooltipWindow}}" stepKey="dontSeeTooltip"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,11 @@
8484
<argument name="contentType"/>
8585
<argument name="targetIndex" defaultValue="1" type="string"/>
8686
<argument name="expectedIndex" defaultValue="2" type="string"/>
87+
<argument name="contentTypeXCoordinate" defaultValue="null" type="string"/>
88+
<argument name="contentTypeYCoordinate" defaultValue="null" type="string"/>
8789
</arguments>
8890
<waitForElementVisible selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, targetIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
89-
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, targetIndex)}}" stepKey="onMouseOverContentTypeStage"/>
91+
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, targetIndex)}}" x="{{contentTypeXCoordinate}}" y="{{contentTypeYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
9092
<waitForElementVisible selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex(contentType.role, targetIndex)}}" stepKey="waitForOptionsMenu"/>
9193
<click selector="{{PageBuilderContentTypeOptionsMenu.contentTypeDuplicate(contentType.role, targetIndex)}}" stepKey="clickDuplicateContentType"/>
9294
<waitForPageLoad time="30" stepKey="waitForAnimation"/>

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

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,19 @@
215215
<data key="fieldName">border_width</data>
216216
<data key="value"/>
217217
</entity>
218-
<entity name="PageBuilderAdvancedBorderWidthPropertyInvalid" type="pagebuilder_advanced_border_width_property">
218+
<entity name="PageBuilderAdvancedBorderWidthProperty_NonNumeric" type="pagebuilder_advanced_border_width_property">
219219
<data key="name">Border Width</data>
220220
<data key="section">advanced</data>
221221
<data key="fieldName">border_width</data>
222222
<data key="value">garbage</data>
223+
<data key="errorMessage">Please enter a valid number in this field.</data>
224+
</entity>
225+
<entity name="PageBuilderAdvancedBorderWidthProperty_Negative" type="pagebuilder_advanced_border_width_property">
226+
<data key="name">Border Width</data>
227+
<data key="section">advanced</data>
228+
<data key="fieldName">border_width</data>
229+
<data key="value">-1</data>
230+
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
223231
</entity>
224232
<!-- Border Radius -->
225233
<entity name="PageBuilderAdvancedBorderRadiusDefaultProperty" type="pagebuilder_advanced_border_radius_property">
@@ -254,11 +262,19 @@
254262
<data key="fieldName">border_radius</data>
255263
<data key="value">500</data>
256264
</entity>
257-
<entity name="PageBuilderAdvancedBorderRadiusPropertyInvalid" type="pagebuilder_advanced_border_radius_property">
265+
<entity name="PageBuilderAdvancedBorderRadiusProperty_NonNumeric" type="pagebuilder_advanced_border_radius_property">
258266
<data key="name">Border Radius</data>
259267
<data key="section">advanced</data>
260268
<data key="fieldName">border_radius</data>
261269
<data key="value">garbage</data>
270+
<data key="errorMessage">Please enter a valid number in this field.</data>
271+
</entity>
272+
<entity name="PageBuilderAdvancedBorderRadiusProperty_Negative" type="pagebuilder_advanced_border_radius_property">
273+
<data key="name">Border Radius</data>
274+
<data key="section">advanced</data>
275+
<data key="fieldName">border_radius</data>
276+
<data key="value">-1</data>
277+
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
262278
</entity>
263279
<!-- CSS Classes -->
264280
<entity name="PageBuilderAdvancedCssClassesDefaultProperty" type="pagebuilder_advanced_css_classes_property">
@@ -349,14 +365,15 @@
349365
<data key="marginBottom">3</data>
350366
<data key="marginLeft">4</data>
351367
</entity>
352-
<entity name="PageBuilderMarginsPropertyInvalid" type="pagebuilder_margins_property">
368+
<entity name="PageBuilderMarginsProperty_NonNumeric" type="pagebuilder_margins_property">
353369
<data key="name">Margins and Padding</data>
354370
<data key="section">advanced</data>
355371
<data key="fieldName">margins_and_padding</data>
356372
<data key="marginTop">garbage</data>
357373
<data key="marginRight">garbage</data>
358374
<data key="marginBottom">garbage</data>
359375
<data key="marginLeft">garbage</data>
376+
<data key="errorMessage">Please enter a valid number in this field.</data>
360377
</entity>
361378
<entity name="PageBuilderMarginsPropertyRowDefault" type="pagebuilder_margins_property">
362379
<data key="name">Margins and Padding</data>
@@ -528,4 +545,15 @@
528545
<data key="paddingBottom">0</data>
529546
<data key="paddingLeft">0</data>
530547
</entity>
548+
<entity name="PageBuilderAdvancedMarginsAndPaddingBoundaryData" type="pagebuilder_advanced_margins_and_padding_property">
549+
<data key="name">Margins and Padding</data>
550+
<data key="section">advanced</data>
551+
<data key="fieldName">margins_and_padding</data>
552+
<data key="invalidString">garbage</data>
553+
<data key="invalidMin">-1000</data>
554+
<data key="invalidMax">1000</data>
555+
<data key="invalidStringError">Please enter a valid number in this field.</data>
556+
<data key="invalidMinError">Please enter a value greater than or equal to -999.</data>
557+
<data key="invalidMaxError">Please enter a value less than or equal to 999.</data>
558+
</entity>
531559
</entities>

0 commit comments

Comments
 (0)