Skip to content

Commit c169ddb

Browse files
author
Cari Spruiell
authored
Merge pull request #156 from magento-obsessive-owls/cms-team-1-delivery
[Owls] Page Builder Bug Fixes
2 parents 9450fa6 + fbb7e2c commit c169ddb

File tree

51 files changed

+1201
-187
lines changed

Some content is hidden

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

51 files changed

+1201
-187
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<attachFile userInput="{{property.value}}" selector="{{ImageOnStage.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
1616
<waitForPageLoad stepKey="waitForPageLoad"/>
1717
<waitForElementVisible selector="{{ImageOnStage.imagePreview}}" stepKey="waitForImagePreview"/>
18-
<waitForElementVisible selector="{{ImageOnStage.imageSourceOnStage(property.fileName)}}" stepKey="waitForImageSource"/>
18+
<waitForElementVisible selector="{{ImageOnStage.imageSource(property.fileName)}}" stepKey="waitForImageSource"/>
1919
</actionGroup>
2020
<actionGroup name="verifyImageOnSlideout">
2121
<arguments>

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
1919
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
2020
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
21+
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
2122
</actionGroup>
2223
<actionGroup name="saveLocationForm">
2324
<comment userInput="saveLocationForm" stepKey="comment"/>
@@ -48,6 +49,7 @@
4849
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
4950
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
5051
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
52+
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
5153
</actionGroup>
5254
<actionGroup name="clickEditButtonOnLocationGrid">
5355
<arguments>
@@ -63,6 +65,7 @@
6365
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
6466
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
6567
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
68+
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
6669
</actionGroup>
6770
<actionGroup name="deleteLocationFromGrid">
6871
<arguments>
@@ -106,6 +109,7 @@
106109
</arguments>
107110
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
108111
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
112+
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
109113
<waitForElementVisible selector="{{AddLocationForm.base}}" stepKey="waitForMapVisible"/>
110114
<clickWithLeftButton selector="{{AddLocationForm.base}}" x="{{x}}" y="{{y}}" stepKey="clickMapToMovePin"/>
111115
<waitForElementVisible selector="{{AddLocationForm.pin}}" stepKey="waitForPinVisible"/>
@@ -118,7 +122,12 @@
118122
</arguments>
119123
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
120124
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
125+
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
121126
<waitForElementVisible selector="{{AddLocationForm.clickablePin}}" stepKey="waitForMapVisible"/>
127+
<!-- Adding 2nd click to reduce flakiness -->
128+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton2"/>
129+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone2"/>
130+
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM2"/>
122131
<dragAndDrop selector1="{{AddLocationForm.clickablePin}}" selector2="{{AddLocationForm.clickablePin}}" x="{{x}}" y="{{y}}" stepKey="dragAndDropOnMapToMovePin"/>
123132
<wait time="2" stepKey="waitForPinMove"/>
124133
</actionGroup>
@@ -129,6 +138,7 @@
129138
</arguments>
130139
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
131140
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
141+
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
132142
<waitForElementVisible selector="{{page.pin(index)}}" stepKey="waitForMapWithPin"/>
133143
</actionGroup>
134144
<actionGroup name="verifyNumberOfPinsOnMap">
@@ -139,6 +149,7 @@
139149
</arguments>
140150
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
141151
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
152+
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM"/>
142153
<waitForElementVisible selector="{{page.base(mapIndex)}}" stepKey="waitForMap"/>
143154
<waitForElementVisible selector="{{page.pin(mapIndex)}}" stepKey="waitForMapPin"/>
144155
<seeNumberOfElements selector="{{page.pin(mapIndex)}}" userInput="{{count}}" stepKey="seeNumberOfPins"/>
@@ -150,6 +161,7 @@
150161
</arguments>
151162
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
152163
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
164+
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
153165
<dontSeeElement selector="{{page.pin(index)}}" stepKey="dontSeeMapPin"/>
154166
</actionGroup>
155167
<actionGroup name="validateMapButtons">
@@ -160,6 +172,7 @@
160172
<comment userInput="validateMapButtons" stepKey="comment"/>
161173
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
162174
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
175+
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
163176
<waitForElementVisible selector="{{page.base(index)}}" stepKey="seeMap"/>
164177
<waitForElementVisible selector="{{page.fullScreen(index)}}" stepKey="waitForFullScreenButton"/>
165178
<waitForElementVisible selector="{{page.zoomIn(index)}}" stepKey="waitForMapZoomIn"/>
@@ -173,6 +186,7 @@
173186
<comment userInput="validateNoMapButtons" stepKey="comment"/>
174187
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
175188
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
189+
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
176190
<waitForElementVisible selector="{{page.base(index)}}" stepKey="seeMap"/>
177191
<waitForElement selector="{{page.fullScreen(index)}}" stepKey="waitForFullScreenButton"/>
178192
<dontSeeElement selector="{{page.fullScreen(index)}}" stepKey="dontSeeFullScreenButton"/>
@@ -217,7 +231,12 @@
217231
<comment userInput="openMapPinTooltipWindow" stepKey="comment"/>
218232
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
219233
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
234+
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM"/>
220235
<waitForElementVisible selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
236+
<!-- Adding 2nd click to reduce flakiness -->
237+
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton2"/>
238+
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone2"/>
239+
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM2"/>
221240
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
222241
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
223242
</actionGroup>
@@ -249,7 +268,12 @@
249268
<comment userInput="validateMapPinLocationData" stepKey="comment1"/>
250269
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
251270
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
271+
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM"/>
252272
<waitForElementVisible selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
273+
<!-- Adding 2nd click to reduce flakiness -->
274+
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton2"/>
275+
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone2"/>
276+
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM2"/>
253277
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
254278
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
255279
<waitForElementVisible selector="{{page.locationName(mapIndex, locationName.value)}}" stepKey="waitForLocationName"/>
@@ -265,7 +289,12 @@
265289
<comment userInput="validateNoPinTooltip" stepKey="comment"/>
266290
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
267291
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
292+
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
268293
<waitForElementVisible selector="{{AddLocationForm.clickablePin}}" stepKey="waitForPin"/>
294+
<!-- Adding 2nd click to reduce flakiness -->
295+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton2"/>
296+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone2"/>
297+
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM2"/>
269298
<click selector="{{AddLocationForm.clickablePin}}" stepKey="clickPin"/>
270299
<dontSeeElementInDOM selector="{{AddLocationForm.tooltipWindow}}" stepKey="dontSeeTooltip"/>
271300
</actionGroup>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,13 @@
348348
</arguments>
349349
<dontSeeElementInDOM selector="{{EditPanelForm.panelFieldNoAfterLabelText(property.fieldName)}}" stepKey="dontSeeElementInDOM"/>
350350
</actionGroup>
351+
<actionGroup name="validateSlideOutPanelFieldNotPresent">
352+
<arguments>
353+
<argument name="property"/>
354+
</arguments>
355+
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
356+
<dontSee selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="dontSeeField"/>
357+
</actionGroup>
351358
<actionGroup name="validateAlignmentFieldIsNotDisabled">
352359
<arguments>
353360
<argument name="property"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
</arguments>
9999
<attachFile userInput="{{property.value}}" selector="{{section.uploadImageInput(index)}}" stepKey="attachImageFromLocalToStage"/>
100100
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
101-
<waitForElementVisible selector="{{PageBuilderStage.imageSource(property.fileName)}}" stepKey="waitForMainImageSource1"/>
101+
<waitForElementVisible selector="{{section.imageSourceByIndex(index, property.fileName)}}" stepKey="waitForMainImageSource1"/>
102102
</actionGroup>
103103
<actionGroup name="inlineEditWYSIWYGFromStage">
104104
<arguments>

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

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,53 @@
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11-
<entity name="PageBuilderProductsCountProperty" type="pagebuilder_content_type">
12-
<data key="name">Products Count</data>
13-
<data key="section">display</data>
11+
<entity name="PageBuilderProductsCountPropertyOne" type="pagebuilder_content_type">
12+
<data key="name">Number of Products to Display</data>
13+
<data key="section">general</data>
14+
<data key="fieldName">products_count</data>
15+
<data key="value">1</data>
16+
</entity>
17+
<entity name="PageBuilderProductsCountPropertyFour" type="pagebuilder_content_type">
18+
<data key="name">Number of Products to Display</data>
19+
<data key="section">general</data>
1420
<data key="fieldName">products_count</data>
1521
<data key="value">4</data>
1622
</entity>
23+
<entity name="PageBuilderProductsCountPropertyMax" type="pagebuilder_content_type">
24+
<data key="name">Number of Products to Display</data>
25+
<data key="section">general</data>
26+
<data key="fieldName">products_count</data>
27+
<data key="value">999</data>
28+
</entity>
29+
30+
<entity name="PageBuilderProductsInvalidMinCountProperty" type="pagebuilder_content_type">
31+
<data key="name">Number of Products to Display</data>
32+
<data key="section">general</data>
33+
<data key="fieldName">products_count</data>
34+
<data key="value">0</data>
35+
<data key="errorMessage">Please enter a value greater than or equal to 1.</data>
36+
</entity>
37+
<entity name="PageBuilderProductsInvalidMaxCountProperty" type="pagebuilder_content_type">
38+
<data key="name">Number of Products to Display</data>
39+
<data key="section">general</data>
40+
<data key="fieldName">products_count</data>
41+
<data key="value">1000</data>
42+
<data key="errorMessage">Please enter a value less than or equal to 999.</data>
43+
</entity>
44+
<entity name="PageBuilderProductsInvalidTypeCountProperty" type="pagebuilder_content_type">
45+
<data key="name">Number of Products to Display</data>
46+
<data key="section">general</data>
47+
<data key="fieldName">products_count</data>
48+
<data key="value">Invalid</data>
49+
<data key="errorMessage">Please enter a valid number in this field.</data>
50+
</entity>
51+
<entity name="PageBuilderProductsInvalidEmptyCountProperty" type="pagebuilder_content_type">
52+
<data key="name">Number of Products to Display</data>
53+
<data key="section">general</data>
54+
<data key="fieldName">products_count</data>
55+
<data key="value"/>
56+
<data key="errorMessage">This is a required field.</data>
57+
</entity>
1758
<entity name="PageBuilderProductsSubCategory" type="category">
1859
<data key="name" unique="suffix">PageBuilderProductsSubCategory</data>
1960
<data key="is_active">true</data>

0 commit comments

Comments
 (0)