Skip to content

Commit 5556b50

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'origin/MC-3413-fix-maps-tests' into cms-team-1-delivery
2 parents 644b2f9 + 00fa343 commit 5556b50

13 files changed

+58
-245
lines changed

‎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/Section/PageBuilderEditFormSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<element name="editFormSave" type="button" selector=".modal-header .page-main-actions [data-form-role='save']" timeout="30"/>
1717
<element name="editPanelSectionName" type="button" selector="//div[@data-index='{{arg1}}']" parameterized="true"/>
1818
<element name="editPanelSectionExpanded" type="button" selector="//div[@data-index='{{arg1}}' and contains(@class,'_show')]" parameterized="true"/>
19-
<element name="panelFieldLabel" type="text" selector='//aside//div[@data-index="{{arg1}}"]/descendant::div[@data-index="{{arg2}}"]/descendant::label[not(contains(@style,"display: none;"))] | //aside//div[@data-index="{{arg3}}"]/descendant::*[@class="admin__field-label" or @class="title"]/descendant::span[text()="{{arg4}}"]' parameterized="true" />
19+
<element name="panelFieldLabel" type="text" selector='//aside//div[@data-index="{{arg1}}"]/descendant::div[@data-index="{{arg2}}"]/descendant::label[not(contains(@style,"display: none;"))] | //aside//div[@data-index="{{arg3}}"]/descendant::*[@class="admin__field-label" or @class="title"]/descendant::span[text()="{{arg4}}"][not(ancestor::legend)]' parameterized="true" />
2020
<element name="panelSectionChangedIcon" type="text" selector="[data-index='{{arg1}}'] ._changed .admin__page-nav-item-message-icon" parameterized="true"/>
2121
<element name="panelSectionError" type="text" selector="[data-index='{{arg1}}'] span._error .admin__page-nav-item-message-icon" parameterized="true"/>
2222
<element name="panelFieldControl" type="input" selector='//aside//div[@data-index="{{arg1}}"]/descendant::*[@name="{{arg2}}"]' parameterized="true"/>

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,8 @@
4141
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]/div[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
4242
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]/div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
4343
<!-- Map Buttons -->
44+
<element name="googleModalOkButton" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@class='dismissButton' and .='OK']" parameterized="true"/>
4445
<element name="fullScreen" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//button[@title='Toggle fullscreen view']" parameterized="true"/>
45-
<element name="allPegmen" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@aria-label='Street View Pegman Control']" parameterized="true"/>
46-
<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"/>
47-
<element name="satelliteView" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@title='Show satellite imagery']" parameterized="true"/>
48-
<element name="streetView" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@title='Show street map']" parameterized="true"/>
4946
<element name="zoomIn" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//button[@title='Zoom in']" parameterized="true"/>
5047
<element name="zoomOut" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//button[@title='Zoom out']" parameterized="true"/>
5148
<!-- Map Error Message -->
@@ -87,11 +84,8 @@
8784
<element name="margins" type="text" selector="(//div[@data-role='map'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
8885
<element name="padding" type="text" selector="(//div[@data-role='map'])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
8986
<!-- Map Buttons -->
87+
<element name="googleModalOkButton" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@class='dismissButton' and .='OK']" parameterized="true"/>
9088
<element name="fullScreen" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@title='Toggle fullscreen view']" parameterized="true"/>
91-
<element name="allPegmen" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//div[@aria-label='Street View Pegman Control']" parameterized="true"/>
92-
<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"/>
93-
<element name="satelliteView" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//div[@title='Show satellite imagery']" parameterized="true"/>
94-
<element name="streetView" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//div[@title='Show street map']" parameterized="true"/>
9589
<element name="zoomIn" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@title='Zoom in']" parameterized="true"/>
9690
<element name="zoomOut" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//button[@title='Zoom out']" parameterized="true"/>
9791
<!-- Map Error Message -->
@@ -119,10 +113,8 @@
119113
<element name="warningMessageLink" type="button" selector="//div[contains(@class, 'pagebuilder_modal_form_pagebuilder_modal_form_modal')]//div[contains(@class, 'message-warning')]//a"/>
120114
<element name="renderedMap" type="button" selector="//div[@data-index='position']//div[@class='map-field']/div/div[contains(@class, 'gm-style')]"/>
121115
<!-- Map Buttons -->
116+
<element name="googleModalOkButton" type="button" selector="//aside//button[@class='dismissButton' and .='OK'][{{arg1}}]" parameterized="true"/>
122117
<element name="fullScreen" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//button[@title='Toggle fullscreen view'])[{{arg1}}]" parameterized="true"/>
123-
<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"/>
124-
<element name="satelliteView" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//div[@title='Show satellite imagery'])[{{arg1}}]" parameterized="true"/>
125-
<element name="streetView" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//div[@title='Show street map'])[{{arg1}}]" parameterized="true"/>
126118
<element name="zoomIn" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//button[@title='Zoom in'])[{{arg1}}]" parameterized="true"/>
127119
<element name="zoomOut" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//button[@title='Zoom out'])[{{arg1}}]" parameterized="true"/>
128120
</section>

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/suite.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<suite name="PageBuilderWithWYSIWYG">
1010
<before>
1111
<createData stepKey="enablePageBuilderAndWYSIWYG" entity="enablePageBuilderAndWYSIWYGForm"/>
12-
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key AIzaSyCw10cOO31cpxb2bcwnHPHKtxov8oUbxJw" stepKey="setGoogleMapsAPIKey"/>
12+
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key {{googleMapsAPIKey.valid}}" stepKey="setGoogleMapsAPIKey"/>
1313
</before>
1414
<after>
1515
<createData stepKey="DisabledWYSIWYG" entity="disableWYSYWYGForm"/>

0 commit comments

Comments
 (0)