Skip to content

Commit 6be330a

Browse files
committed
MC-10833: Resolve TypeScript errors
- Ensure Google Maps links all target=_blank - Fix tests to swap to new tab
1 parent 1061832 commit 6be330a

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,12 @@
405405
</arguments>
406406
<waitForElementVisible selector="{{section.warningMessageLink('1')}}" stepKey="waitForWarningMessageLink"/>
407407
<click selector="{{section.warningMessageLink('1')}}" stepKey="clickLink"/>
408+
<waitForPageLoad stepKey="waitForLinkClick"/>
409+
<switchToNextTab stepKey="switchToOpenedLink" />
408410
<waitForPageLoad stepKey="waitForPageLoad"/>
409411
<seeInCurrentUrl url="{{AdminContentManagementPage.url}}#cms_pagebuilder" stepKey="validateURL"/>
410412
<seeElement selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="seeGoogleMapsAPIKeyInputField"/>
413+
<closeTab stepKey="closeOpenedTab" />
411414
</actionGroup>
412415
<actionGroup name="validateAdvancedStyleWithAllUpdatedMapWithErrorOverlay" extends="validateAdvancedStyleWithAllUpdatedNotVisible">
413416
<waitForElementVisible selector="{{page.warningMessageLink(index)}}" stepKey="dontSeeElement"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTests.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
<actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink1">
133133
<argument name="section" value="MapOnStage"/>
134134
</actionGroup>
135-
<moveBack stepKey="moveBack1"/>
136135
<waitForPageLoad stepKey="waitForPageLoad1"/>
137136
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
138137
<!-- Edit Form: Validate Warning Message Link -->
@@ -143,14 +142,8 @@
143142
<actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink2">
144143
<argument name="section" value="EditMapForm"/>
145144
</actionGroup>
146-
<moveBack stepKey="moveBack2"/>
147145
<waitForPageLoad stepKey="waitForPageLoad2"/>
148-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
149146
<!-- Location Form: Validate Warning Message Link -->
150-
<comment userInput="Location Form: Validate Warning Message Link" stepKey="commentValidateWarningMessageLinkLocationForm"/>
151-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel2">
152-
<argument name="contentType" value="PageBuilderMapContentType"/>
153-
</actionGroup>
154147
<actionGroup ref="clickAddLocationButton" stepKey="clickAddLocationButton"/>
155148
<actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink3">
156149
<argument name="section" value="AddLocationForm"/>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_map_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<item name="additionalClasses" xsi:type="string">message message-warning</item>
7272
<item name="visible" xsi:type="boolean">false</item>
7373
<item name="map_configuration_url" xsi:type="string">adminhtml/system_config/edit/section/cms</item>
74-
<item name="content" xsi:type="string" translate="true"><![CDATA[You must provide a valid <a href="%s">Google Maps API key</a> to use a map.]]></item>
74+
<item name="content" xsi:type="string" translate="true"><![CDATA[You must provide a valid <a href="%s" target="_blank">Google Maps API key</a> to use a map.]]></item>
7575
</item>
7676
</argument>
7777
</container>

0 commit comments

Comments
 (0)