Skip to content

Commit 6d3478c

Browse files
dhaeckerdhaecker
committed
MC-3413: Update Google Maps API Key & Unskip Maps Tests
- Moving close gmaps error message to existing action groups - Deleting old selectors
1 parent 3cba69e commit 6d3478c

8 files changed

+26
-134
lines changed

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

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="closeGoogleMapsErrorModal">
12-
<arguments>
13-
<argument name="section" defaultValue="AddLocationForm"/>
14-
<argument name="index" defaultValue="1" type="string"/>
15-
</arguments>
16-
<waitForElementVisible selector="{{section.googleModalOkButton(index)}}" stepKey="waitForOkButton"/>
17-
<click selector="{{section.googleModalOkButton(index)}}" stepKey="clickOkButton"/>
18-
<waitForElementNotVisible selector="{{section.googleModalOkButton(index)}}" stepKey="waitForOkButtonNotVisible"/>
19-
</actionGroup>
2011
<actionGroup name="clickAddLocationButton">
2112
<comment userInput="clickAddLocationButton" stepKey="comment"/>
2213
<waitForPageLoad stepKey="waitForPageLoad1"/>
@@ -25,6 +16,8 @@
2516
<waitForPageLoad stepKey="waitForPageLoad2"/>
2617
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
2718
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
19+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
20+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
2821
</actionGroup>
2922
<actionGroup name="saveLocationForm">
3023
<comment userInput="saveLocationForm" stepKey="comment"/>
@@ -53,6 +46,8 @@
5346
<waitForPageLoad stepKey="waitForPageLoad"/>
5447
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
5548
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
49+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
50+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
5651
</actionGroup>
5752
<actionGroup name="clickEditButtonOnLocationGrid">
5853
<arguments>
@@ -66,6 +61,8 @@
6661
<waitForPageLoad stepKey="waitForPageLoad"/>
6762
<waitForElementVisible selector="{{AddLocationForm.form}}" stepKey="waitForForm"/>
6863
<see userInput="Add Location" selector="{{AddLocationForm.formTitle}}" stepKey="seeFormTitle"/>
64+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
65+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
6966
</actionGroup>
7067
<actionGroup name="deleteLocationFromGrid">
7168
<arguments>
@@ -107,6 +104,8 @@
107104
<argument name="x" defaultValue="null" type="string"/>
108105
<argument name="y" defaultValue="null" type="string"/>
109106
</arguments>
107+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
108+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
110109
<waitForElementVisible selector="{{AddLocationForm.base}}" stepKey="waitForMapVisible"/>
111110
<clickWithLeftButton selector="{{AddLocationForm.base}}" x="{{x}}" y="{{y}}" stepKey="clickMapToMovePin"/>
112111
<waitForElementVisible selector="{{AddLocationForm.pin}}" stepKey="waitForPinVisible"/>
@@ -117,6 +116,8 @@
117116
<argument name="x" defaultValue="null" type="string"/>
118117
<argument name="y" defaultValue="null" type="string"/>
119118
</arguments>
119+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
120+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
120121
<waitForElementVisible selector="{{AddLocationForm.clickablePin}}" stepKey="waitForMapVisible"/>
121122
<dragAndDrop selector1="{{AddLocationForm.clickablePin}}" selector2="{{AddLocationForm.clickablePin}}" x="{{x}}" y="{{y}}" stepKey="dragAndDropOnMapToMovePin"/>
122123
<wait time="2" stepKey="waitForPinMove"/>
@@ -126,6 +127,8 @@
126127
<argument name="page" defaultValue="MapOnStage"/>
127128
<argument name="index" defaultValue="1" type="string"/>
128129
</arguments>
130+
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
131+
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
129132
<waitForElementVisible selector="{{page.pin(index)}}" stepKey="waitForMapWithPin"/>
130133
</actionGroup>
131134
<actionGroup name="verifyNumberOfPinsOnMap">
@@ -134,6 +137,8 @@
134137
<argument name="mapIndex" defaultValue="1" type="string"/>
135138
<argument name="count" type="string"/>
136139
</arguments>
140+
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
141+
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
137142
<waitForElementVisible selector="{{page.base(mapIndex)}}" stepKey="waitForMap"/>
138143
<waitForElementVisible selector="{{page.pin(mapIndex)}}" stepKey="waitForMapPin"/>
139144
<seeNumberOfElements selector="{{page.pin(mapIndex)}}" userInput="{{count}}" stepKey="seeNumberOfPins"/>
@@ -143,6 +148,8 @@
143148
<argument name="page" defaultValue="MapOnStage"/>
144149
<argument name="index" defaultValue="1" type="string"/>
145150
</arguments>
151+
<conditionalClick selector="{{page.googleModalOkButton(index)}}" dependentSelector="{{page.googleModalOkButton(index)}}" visible="true" stepKey="clickOkButton"/>
152+
<waitForElementNotVisible selector="{{page.googleModalOkButton(index)}}" stepKey="waitForGoogleModalGone"/>
146153
<dontSeeElement selector="{{page.pin(index)}}" stepKey="dontSeeMapPin"/>
147154
</actionGroup>
148155
<actionGroup name="validateMapButtons">
@@ -151,11 +158,10 @@
151158
<argument name="index" defaultValue="1" type="string"/>
152159
</arguments>
153160
<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"/>
154163
<waitForElementVisible selector="{{page.base(index)}}" stepKey="seeMap"/>
155164
<waitForElementVisible selector="{{page.fullScreen(index)}}" stepKey="waitForFullScreenButton"/>
156-
<waitForElementVisible selector="{{page.pegman(index)}}" stepKey="waitForMapPegman"/>
157-
<waitForElementVisible selector="{{page.satelliteView(index)}}" stepKey="waitForMapSatelliteView"/>
158-
<waitForElementVisible selector="{{page.streetView(index)}}" stepKey="waitForMapStreetView"/>
159165
<waitForElementVisible selector="{{page.zoomIn(index)}}" stepKey="waitForMapZoomIn"/>
160166
<waitForElementVisible selector="{{page.zoomOut(index)}}" stepKey="waitForMapZoomOut"/>
161167
</actionGroup>
@@ -165,12 +171,11 @@
165171
<argument name="index" defaultValue="1" type="string"/>
166172
</arguments>
167173
<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"/>
168176
<waitForElementVisible selector="{{page.base(index)}}" stepKey="seeMap"/>
169177
<waitForElement selector="{{page.fullScreen(index)}}" stepKey="waitForFullScreenButton"/>
170178
<dontSeeElement selector="{{page.fullScreen(index)}}" stepKey="dontSeeFullScreenButton"/>
171-
<dontSeeElementInDOM selector="{{page.allPegmen(index)}}" stepKey="dontSeeMapPegman"/>
172-
<dontSeeElementInDOM selector="{{page.satelliteView(index)}}" stepKey="dontSeeMapSatelliteView"/>
173-
<dontSeeElementInDOM selector="{{page.streetView(index)}}" stepKey="dontSeeMapStreetView"/>
174179
<dontSeeElementInDOM selector="{{page.zoomIn(index)}}" stepKey="dontSeeMapZoomIn"/>
175180
<dontSeeElementInDOM selector="{{page.zoomOut(index)}}" stepKey="dontSeeMapZoomOut"/>
176181
</actionGroup>
@@ -210,6 +215,8 @@
210215
<argument name="pinIndex" defaultValue="1" type="string"/>
211216
</arguments>
212217
<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"/>
213220
<waitForElementVisible selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
214221
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
215222
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
@@ -238,6 +245,8 @@
238245
<argument name="pinIndex" defaultValue="1" type="string"/>
239246
</arguments>
240247
<comment userInput="validateMapPinLocationData" stepKey="comment1"/>
248+
<conditionalClick selector="{{page.googleModalOkButton(mapIndex)}}" dependentSelector="{{page.googleModalOkButton(mapIndex)}}" visible="true" stepKey="clickOkButton"/>
249+
<waitForElementNotVisible selector="{{page.googleModalOkButton(mapIndex)}}" stepKey="waitForGoogleModalGone"/>
241250
<waitForElementVisible selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="waitForPin"/>
242251
<click selector="{{page.clickablePin(mapIndex, pinIndex)}}" stepKey="clickPin"/>
243252
<waitForElementVisible selector="{{page.tooltipWindow(mapIndex)}}" stepKey="waitForPinTooltip"/>
@@ -250,6 +259,8 @@
250259
</actionGroup>
251260
<actionGroup name="validateNoPinTooltip">
252261
<comment userInput="validateNoPinTooltip" stepKey="comment"/>
262+
<conditionalClick selector="{{AddLocationForm.googleModalOkButton('1')}}" dependentSelector="{{AddLocationForm.googleModalOkButton('1')}}" visible="true" stepKey="clickOkButton"/>
263+
<waitForElementNotVisible selector="{{AddLocationForm.googleModalOkButton('1')}}" stepKey="waitForGoogleModalGone"/>
253264
<waitForElementVisible selector="{{AddLocationForm.clickablePin}}" stepKey="waitForPin"/>
254265
<click selector="{{AddLocationForm.clickablePin}}" stepKey="clickPin"/>
255266
<dontSeeElementInDOM selector="{{AddLocationForm.tooltipWindow}}" stepKey="dontSeeTooltip"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343
<!-- Map Buttons -->
4444
<element name="googleModalOkButton" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@class='dismissButton' and .='OK']" parameterized="true"/>
4545
<element name="fullScreen" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//button[@title='Toggle fullscreen view']" parameterized="true"/>
46-
<element name="allPegmen" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@aria-label='Street View Pegman Control']" parameterized="true"/>
47-
<element name="pegman" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@aria-label='Street View Pegman Control' and not(contains(@style,'visibility: hidden;'))]" parameterized="true"/>
48-
<element name="satelliteView" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@title='Show satellite imagery']" parameterized="true"/>
49-
<element name="streetView" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@title='Show street map']" parameterized="true"/>
5046
<element name="zoomIn" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//button[@title='Zoom in']" parameterized="true"/>
5147
<element name="zoomOut" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//button[@title='Zoom out']" parameterized="true"/>
5248
<!-- Map Error Message -->
@@ -90,10 +86,6 @@
9086
<!-- Map Buttons -->
9187
<element name="googleModalOkButton" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@class='dismissButton' and .='OK']" parameterized="true"/>
9288
<element name="fullScreen" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@title='Toggle fullscreen view']" parameterized="true"/>
93-
<element name="allPegmen" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//div[@aria-label='Street View Pegman Control']" parameterized="true"/>
94-
<element name="pegman" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//div[@aria-label='Street View Pegman Control' and not(contains(@style,'visibility: hidden;'))]" parameterized="true"/>
95-
<element name="satelliteView" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//div[@title='Show satellite imagery']" parameterized="true"/>
96-
<element name="streetView" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//div[@title='Show street map']" parameterized="true"/>
9789
<element name="zoomIn" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@title='Zoom in']" parameterized="true"/>
9890
<element name="zoomOut" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@title='Zoom out']" parameterized="true"/>
9991
<!-- Map Error Message -->
@@ -123,9 +115,6 @@
123115
<!-- Map Buttons -->
124116
<element name="googleModalOkButton" type="button" selector="//aside//button[@class='dismissButton' and .='OK'][{{arg1}}]" parameterized="true"/>
125117
<element name="fullScreen" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//button[@title='Toggle fullscreen view'])[{{arg1}}]" parameterized="true"/>
126-
<element name="pegman" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//div[@aria-label='Street View Pegman Control' and not(contains(@style,'visibility: hidden;'))])[{{arg1}}]" parameterized="true"/>
127-
<element name="satelliteView" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//div[@title='Show satellite imagery'])[{{arg1}}]" parameterized="true"/>
128-
<element name="streetView" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//div[@title='Show street map'])[{{arg1}}]" parameterized="true"/>
129118
<element name="zoomIn" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//button[@title='Zoom in'])[{{arg1}}]" parameterized="true"/>
130119
<element name="zoomOut" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//button[@title='Zoom out'])[{{arg1}}]" parameterized="true"/>
131120
</section>

0 commit comments

Comments
 (0)