Skip to content

Commit 0340fb0

Browse files
dhaeckerdhaecker
committed
Merge branch 'MC-5255' into cms-team-1-delivery
2 parents 1cc2b76 + 07cbb87 commit 0340fb0

File tree

5 files changed

+55
-29
lines changed

5 files changed

+55
-29
lines changed

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

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
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.googleMapsLink('1')}}|{{AddLocationForm.warningMessageLink('1')}}" stepKey="waitForMap"/>
1920
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
2021
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
2122
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -47,6 +48,7 @@
4748
<waitForPageLoad stepKey="waitForPageLoad"/>
4849
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
4950
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
51+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}|{{AddLocationForm.warningMessageLink('1')}}" stepKey="waitForMap"/>
5052
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
5153
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
5254
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -63,6 +65,7 @@
6365
<waitForPageLoad stepKey="waitForPageLoad"/>
6466
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
6567
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
68+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}|{{AddLocationForm.warningMessageLink('1')}}" stepKey="waitForMap"/>
6669
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
6770
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
6871
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -107,6 +110,7 @@
107110
<argument name="x" defaultValue="null" type="string"/>
108111
<argument name="y" defaultValue="null" type="string"/>
109112
</arguments>
113+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}" stepKey="waitForMap"/>
110114
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
111115
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
112116
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -120,13 +124,10 @@
120124
<argument name="x" defaultValue="null" type="string"/>
121125
<argument name="y" defaultValue="null" type="string"/>
122126
</arguments>
127+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}" stepKey="waitForMap"/>
123128
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
124129
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
125130
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
126-
<!-- Adding 2nd click to reduce flakiness -->
127-
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton2"/>
128-
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone2"/>
129-
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM2"/>
130131
<waitForElement selector="{{AddLocationForm.clickablePin}}" stepKey="waitForMapVisible"/>
131132
<dragAndDrop selector1="{{AddLocationForm.clickablePin}}" selector2="{{AddLocationForm.clickablePin}}" x="{{x}}" y="{{y}}" stepKey="dragAndDropOnMapToMovePin"/>
132133
<wait time="2" stepKey="waitForPinMove"/>
@@ -136,6 +137,7 @@
136137
<argument name="page" defaultValue="MapOnStage"/>
137138
<argument name="index" defaultValue="1" type="string"/>
138139
</arguments>
140+
<waitForElementVisible selector="{{page.googleMapsLink(index)}}" stepKey="waitForMap"/>
139141
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
140142
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
141143
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -147,10 +149,10 @@
147149
<argument name="mapIndex" defaultValue="1" type="string"/>
148150
<argument name="count" type="string"/>
149151
</arguments>
152+
<waitForElementVisible selector="{{page.googleMapsLink(mapIndex)}}" stepKey="waitForMap"/>
150153
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
151154
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
152155
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM"/>
153-
<waitForElementVisible selector="{{page.base(mapIndex)}}" stepKey="waitForMap"/>
154156
<waitForElementVisible selector="{{page.allPins(mapIndex)}}" stepKey="waitForMapPin"/>
155157
<seeNumberOfElements selector="{{page.allPins(mapIndex)}}" userInput="{{count}}" stepKey="seeNumberOfPins"/>
156158
</actionGroup>
@@ -159,6 +161,7 @@
159161
<argument name="page" defaultValue="MapOnStage"/>
160162
<argument name="index" defaultValue="1" type="string"/>
161163
</arguments>
164+
<waitForElementVisible selector="{{page.googleMapsLink(index)}}" stepKey="waitForMap"/>
162165
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
163166
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
164167
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -170,6 +173,7 @@
170173
<argument name="index" defaultValue="1" type="string"/>
171174
</arguments>
172175
<comment userInput="validateMapButtons" stepKey="comment"/>
176+
<waitForElementVisible selector="{{page.googleMapsLink(index)}}" stepKey="waitForMap"/>
173177
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
174178
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
175179
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -184,6 +188,7 @@
184188
<argument name="index" defaultValue="1" type="string"/>
185189
</arguments>
186190
<comment userInput="validateNoMapButtons" stepKey="comment"/>
191+
<waitForElementVisible selector="{{page.googleMapsLink(index)}}" stepKey="waitForMap"/>
187192
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
188193
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
189194
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -217,6 +222,7 @@
217222
</arguments>
218223
<comment userInput="validateMapSettings" stepKey="comment"/>
219224
<waitForElement selector="{{page.base(index)}}" stepKey="waitForMap"/>
225+
<waitForElementVisible selector="{{page.warningMessageLink(index)}}" stepKey="waitForErrorOverlay"/>
220226
<waitForElement selector="{{page.height(index, height.value)}}" stepKey="waitForHeight"/>
221227
<dontSeeElement selector="{{page.height(index, height.value)}}" stepKey="dontSeeHeight"/>
222228
<seeElementInDOM selector="{{page.height(index, height.value)}}" stepKey="seeInDOMHeight"/>
@@ -245,13 +251,10 @@
245251
<argument name="pinIndex" defaultValue="1" type="string"/>
246252
</arguments>
247253
<comment userInput="openMapPinTooltipWindow" stepKey="comment"/>
254+
<waitForElementVisible selector="{{page.googleMapsLink(mapIndex)}}" stepKey="waitForMap"/>
248255
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
249256
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
250257
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM"/>
251-
<!-- Adding 2nd click to reduce flakiness -->
252-
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton2"/>
253-
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone2"/>
254-
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM2"/>
255258
<waitForElement selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
256259
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
257260
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
@@ -282,13 +285,10 @@
282285
<argument name="pinIndex" defaultValue="1" type="string"/>
283286
</arguments>
284287
<comment userInput="validateMapPinLocationData" stepKey="comment1"/>
288+
<waitForElementVisible selector="{{page.googleMapsLink(mapIndex)}}" stepKey="waitForMap"/>
285289
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
286290
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
287291
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM"/>
288-
<!-- Adding 2nd click to reduce flakiness -->
289-
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton2"/>
290-
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone2"/>
291-
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM2"/>
292292
<waitForElement selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
293293
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
294294
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
@@ -303,13 +303,10 @@
303303
</actionGroup>
304304
<actionGroup name="validateNoPinTooltip">
305305
<comment userInput="validateNoPinTooltip" stepKey="comment"/>
306+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}" stepKey="waitForMap"/>
306307
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
307308
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
308309
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
309-
<!-- Adding 2nd click to reduce flakiness -->
310-
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton2"/>
311-
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone2"/>
312-
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM2"/>
313310
<waitForElement selector="{{AddLocationForm.clickablePin}}" stepKey="waitForPin"/>
314311
<click selector="{{AddLocationForm.clickablePin}}" stepKey="clickPin"/>
315312
<dontSeeElementInDOM selector="{{AddLocationForm.tooltipWindow}}" stepKey="dontSeeTooltip"/>
@@ -406,16 +403,16 @@
406403
<arguments>
407404
<argument name="section"/>
408405
</arguments>
409-
<waitForElementVisible selector="{{section.warningMessageLink}}" stepKey="waitForWarningMessageLink"/>
410-
<click selector="{{section.warningMessageLink}}" stepKey="clickLink"/>
406+
<waitForElementVisible selector="{{section.warningMessageLink('1')}}" stepKey="waitForWarningMessageLink"/>
407+
<click selector="{{section.warningMessageLink('1')}}" stepKey="clickLink"/>
411408
<waitForPageLoad stepKey="waitForPageLoad"/>
412409
<seeInCurrentUrl url="{{AdminContentManagementPage.url}}#cms_pagebuilder" stepKey="validateURL"/>
413410
<seeElement selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="seeGoogleMapsAPIKeyInputField"/>
414411
</actionGroup>
415412
<actionGroup name="validateAdvancedStyleWithAllUpdatedMapWithErrorOverlay" extends="validateAdvancedStyleWithAllUpdatedNotVisible">
416-
<comment userInput="removing w/ merge" stepKey="dontSeeElement"/>
413+
<waitForElementVisible selector="{{page.warningMessageLink(index)}}" stepKey="dontSeeElement"/>
417414
</actionGroup>
418415
<actionGroup name="validateAdvancedStyleWithNoAlignmentMapWithErrorOverlay" extends="validateAdvancedStyleWithNoAlignmentNotVisible">
419-
<comment userInput="removing w/ merge" stepKey="dontSeeElement"/>
416+
<waitForElementVisible selector="{{page.warningMessageLink(index)}}" stepKey="dontSeeElement"/>
420417
</actionGroup>
421418
</actionGroups>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@
116116
<data key="fieldName">position[latitude]</data>
117117
<data key="value">/30\.\d+/</data>
118118
</entity>
119+
<entity name="PageBuilderMapLatitude_Positive1" type="pagebuilder_map_latitude_property">
120+
<data key="name">Coordinates</data>
121+
<data key="section">general</data>
122+
<data key="fieldName">position[latitude]</data>
123+
<data key="value">1</data>
124+
</entity>
119125
<entity name="PageBuilderMapLatitude_Positive39_74" type="pagebuilder_map_latitude_property">
120126
<data key="name">Coordinates</data>
121127
<data key="section">general</data>
@@ -182,6 +188,12 @@
182188
<data key="fieldName">position[latitude]</data>
183189
<data key="value">-74.69</data>
184190
</entity>
191+
<entity name="PageBuilderMapLatitude_Negative1" type="pagebuilder_map_latitude_property">
192+
<data key="name">Coordinates</data>
193+
<data key="section">general</data>
194+
<data key="fieldName">position[latitude]</data>
195+
<data key="value">-1</data>
196+
</entity>
185197
<entity name="PageBuilderMapLatitude_0" type="pagebuilder_map_latitude_property">
186198
<data key="name">Coordinates</data>
187199
<data key="section">general</data>
@@ -237,12 +249,24 @@
237249
<data key="fieldName">position[longitude]</data>
238250
<data key="value">/-97\.\d+/</data>
239251
</entity>
252+
<entity name="PageBuilderMapLongitude_Positive1" type="pagebuilder_map_longitude_property">
253+
<data key="name">Coordinates</data>
254+
<data key="section">general</data>
255+
<data key="fieldName">position[longitude]</data>
256+
<data key="value">1</data>
257+
</entity>
240258
<entity name="PageBuilderMapLongitude_Positive9_67" type="pagebuilder_map_longitude_property">
241259
<data key="name">Coordinates</data>
242260
<data key="section">general</data>
243261
<data key="fieldName">position[longitude]</data>
244262
<data key="value">9.67</data>
245263
</entity>
264+
<entity name="PageBuilderMapLongitude_Negative1" type="pagebuilder_map_longitude_property">
265+
<data key="name">Coordinates</data>
266+
<data key="section">general</data>
267+
<data key="fieldName">position[longitude]</data>
268+
<data key="value">-1</data>
269+
</entity>
246270
<entity name="PageBuilderMapLongitude_Negative104_99" type="pagebuilder_map_longitude_property">
247271
<data key="name">Coordinates</data>
248272
<data key="section">general</data>

0 commit comments

Comments
 (0)