Skip to content

Commit cdb9b4b

Browse files
dhaeckerdhaecker
committed
MC-5255: Flaky MFTF Map Tests
- Adding waits for elements that load after gmaps error to prevent flakiness - Adding/updating supporting elements
1 parent 0d9699f commit cdb9b4b

File tree

2 files changed

+21
-36
lines changed

2 files changed

+21
-36
lines changed

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

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<waitForPageLoad stepKey="waitForPageLoad2"/>
1717
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
1818
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
19-
<waitForElement selector="{{AddLocationForm.renderedMap}}" stepKey="waitForMapOnForm"/>
19+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}|{{AddLocationForm.warningMessageLink('1')}}" stepKey="waitForMap"/>
2020
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
2121
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
2222
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -48,7 +48,7 @@
4848
<waitForPageLoad stepKey="waitForPageLoad"/>
4949
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
5050
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
51-
<waitForElement selector="{{AddLocationForm.renderedMap}}" stepKey="waitForMapOnForm"/>
51+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}|{{AddLocationForm.warningMessageLink('1')}}" stepKey="waitForMap"/>
5252
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
5353
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
5454
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -65,7 +65,7 @@
6565
<waitForPageLoad stepKey="waitForPageLoad"/>
6666
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
6767
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
68-
<waitForElement selector="{{AddLocationForm.renderedMap}}" stepKey="waitForMapOnForm"/>
68+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}|{{AddLocationForm.warningMessageLink('1')}}" stepKey="waitForMap"/>
6969
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
7070
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
7171
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -110,7 +110,7 @@
110110
<argument name="x" defaultValue="null" type="string"/>
111111
<argument name="y" defaultValue="null" type="string"/>
112112
</arguments>
113-
<waitForElement selector="{{AddLocationForm.renderedMap}}" stepKey="waitForMapOnForm"/>
113+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}" stepKey="waitForMap"/>
114114
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
115115
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
116116
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -124,14 +124,10 @@
124124
<argument name="x" defaultValue="null" type="string"/>
125125
<argument name="y" defaultValue="null" type="string"/>
126126
</arguments>
127-
<waitForElement selector="{{AddLocationForm.renderedMap}}" stepKey="waitForMapOnForm"/>
127+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}" stepKey="waitForMap"/>
128128
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
129129
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
130130
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
131-
<!-- Adding 2nd click to reduce flakiness -->
132-
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton2"/>
133-
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone2"/>
134-
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM2"/>
135131
<waitForElement selector="{{AddLocationForm.clickablePin}}" stepKey="waitForMapVisible"/>
136132
<dragAndDrop selector1="{{AddLocationForm.clickablePin}}" selector2="{{AddLocationForm.clickablePin}}" x="{{x}}" y="{{y}}" stepKey="dragAndDropOnMapToMovePin"/>
137133
<wait time="2" stepKey="waitForPinMove"/>
@@ -141,7 +137,7 @@
141137
<argument name="page" defaultValue="MapOnStage"/>
142138
<argument name="index" defaultValue="1" type="string"/>
143139
</arguments>
144-
<waitForElement selector="{{page.base(index)}}" stepKey="waitForMapOnStage"/>
140+
<waitForElementVisible selector="{{page.googleMapsLink(index)}}" stepKey="waitForMap"/>
145141
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
146142
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
147143
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -153,11 +149,10 @@
153149
<argument name="mapIndex" defaultValue="1" type="string"/>
154150
<argument name="count" type="string"/>
155151
</arguments>
156-
<waitForElement selector="{{page.base(mapIndex)}}" stepKey="waitForMapOnStage"/>
152+
<waitForElementVisible selector="{{page.googleMapsLink(mapIndex)}}" stepKey="waitForMap"/>
157153
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
158154
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
159155
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM"/>
160-
<waitForElementVisible selector="{{page.base(mapIndex)}}" stepKey="waitForMap"/>
161156
<waitForElementVisible selector="{{page.allPins(mapIndex)}}" stepKey="waitForMapPin"/>
162157
<seeNumberOfElements selector="{{page.allPins(mapIndex)}}" userInput="{{count}}" stepKey="seeNumberOfPins"/>
163158
</actionGroup>
@@ -166,7 +161,7 @@
166161
<argument name="page" defaultValue="MapOnStage"/>
167162
<argument name="index" defaultValue="1" type="string"/>
168163
</arguments>
169-
<waitForElement selector="{{page.base(index)}}" stepKey="waitForMapOnStage"/>
164+
<waitForElementVisible selector="{{page.googleMapsLink(index)}}" stepKey="waitForMap"/>
170165
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
171166
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
172167
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -178,7 +173,7 @@
178173
<argument name="index" defaultValue="1" type="string"/>
179174
</arguments>
180175
<comment userInput="validateMapButtons" stepKey="comment"/>
181-
<waitForElement selector="{{page.base(index)}}" stepKey="waitForMapOnStage"/>
176+
<waitForElementVisible selector="{{page.googleMapsLink(index)}}" stepKey="waitForMap"/>
182177
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
183178
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
184179
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -193,7 +188,7 @@
193188
<argument name="index" defaultValue="1" type="string"/>
194189
</arguments>
195190
<comment userInput="validateNoMapButtons" stepKey="comment"/>
196-
<waitForElement selector="{{page.base(index)}}" stepKey="waitForMapOnStage"/>
191+
<waitForElementVisible selector="{{page.googleMapsLink(index)}}" stepKey="waitForMap"/>
197192
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
198193
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
199194
<dontSeeElementInDOM selector="{{page.googleModalOkButton(index)}}" stepKey="dontSeeGoogleModalInDOM"/>
@@ -255,14 +250,10 @@
255250
<argument name="pinIndex" defaultValue="1" type="string"/>
256251
</arguments>
257252
<comment userInput="openMapPinTooltipWindow" stepKey="comment"/>
258-
<waitForElement selector="{{page.base(mapIndex)}}" stepKey="waitForMapOnStage"/>
253+
<waitForElementVisible selector="{{page.googleMapsLink(mapIndex)}}" stepKey="waitForMap"/>
259254
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
260255
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
261256
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM"/>
262-
<!-- Adding 2nd click to reduce flakiness -->
263-
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton2"/>
264-
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone2"/>
265-
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM2"/>
266257
<waitForElement selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
267258
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
268259
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
@@ -293,14 +284,10 @@
293284
<argument name="pinIndex" defaultValue="1" type="string"/>
294285
</arguments>
295286
<comment userInput="validateMapPinLocationData" stepKey="comment1"/>
296-
<waitForElement selector="{{page.base(mapIndex)}}" stepKey="waitForMapOnStage"/>
287+
<waitForElementVisible selector="{{page.googleMapsLink(mapIndex)}}" stepKey="waitForMap"/>
297288
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
298289
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
299290
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM"/>
300-
<!-- Adding 2nd click to reduce flakiness -->
301-
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton2"/>
302-
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone2"/>
303-
<dontSeeElementInDOM selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="dontSeeGoogleModalInDOM2"/>
304291
<waitForElement selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
305292
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
306293
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
@@ -315,14 +302,10 @@
315302
</actionGroup>
316303
<actionGroup name="validateNoPinTooltip">
317304
<comment userInput="validateNoPinTooltip" stepKey="comment"/>
318-
<waitForElement selector="{{AddLocationForm.renderedMap}}" stepKey="waitForMapOnForm"/>
305+
<waitForElementVisible selector="{{AddLocationForm.googleMapsLink('1')}}" stepKey="waitForMap"/>
319306
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
320307
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
321308
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM"/>
322-
<!-- Adding 2nd click to reduce flakiness -->
323-
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton2"/>
324-
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone2"/>
325-
<dontSeeElementInDOM selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="dontSeeGoogleModalInDOM2"/>
326309
<waitForElement selector="{{AddLocationForm.clickablePin}}" stepKey="waitForPin"/>
327310
<click selector="{{AddLocationForm.clickablePin}}" stepKey="clickPin"/>
328311
<dontSeeElementInDOM selector="{{AddLocationForm.tooltipWindow}}" stepKey="dontSeeTooltip"/>
@@ -419,8 +402,8 @@
419402
<arguments>
420403
<argument name="section"/>
421404
</arguments>
422-
<waitForElementVisible selector="{{section.warningMessageLink}}" stepKey="waitForWarningMessageLink"/>
423-
<click selector="{{section.warningMessageLink}}" stepKey="clickLink"/>
405+
<waitForElementVisible selector="{{section.warningMessageLink('1')}}" stepKey="waitForWarningMessageLink"/>
406+
<click selector="{{section.warningMessageLink('1')}}" stepKey="clickLink"/>
424407
<waitForPageLoad stepKey="waitForPageLoad"/>
425408
<seeInCurrentUrl url="{{AdminContentManagementPage.url}}#cms_pagebuilder" stepKey="validateURL"/>
426409
<seeElement selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="seeGoogleMapsAPIKeyInputField"/>

0 commit comments

Comments
 (0)