Skip to content

Commit 06da7d8

Browse files
committed
MC-5723: Flaky MFTF Map Tests - Google Maps Rate Limit Reached
- MFTF map changes to greatly reduce number of API calls per build
1 parent dd8208c commit 06da7d8

14 files changed

+1050
-3973
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,12 @@
372372
</actionGroup>
373373
<actionGroup name="validateMapErrorMessageStage">
374374
<arguments>
375+
<argument name="page" defaultValue="MapOnStage"/>
375376
<argument name="index" defaultValue="1" type="string"/>
376377
</arguments>
377-
<waitForElement selector="{{MapOnStage.base(index)}}" stepKey="seeMap"/>
378-
<waitForElementVisible selector="{{MapOnStage.errorContainer(index)}}" stepKey="seeMapErrorContainer"/>
379-
<see userInput="{{PageBuilderMapCommonData.mapErrorMessageStage}}" selector="{{MapOnStage.errorContainer(index)}}" stepKey="seeMapErrorMessage"/>
378+
<waitForElement selector="{{page.base(index)}}" stepKey="seeMap"/>
379+
<waitForElementVisible selector="{{page.errorContainer(index)}}" stepKey="seeMapErrorContainer"/>
380+
<see userInput="{{PageBuilderMapCommonData.mapErrorMessageAdmin}}" selector="{{page.errorContainer(index)}}" stepKey="seeMapErrorMessage"/>
380381
</actionGroup>
381382
<actionGroup name="validateMapErrorMessageStorefront">
382383
<arguments>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,14 @@
9191
<actionGroup name="clickAndValidateGoogleMapsAPIKeyTestKeyButton">
9292
<arguments>
9393
<argument name="expectedResult" defaultValue="success" type="string"/>
94+
<argument name="buttonText" type="string"/>
9495
</arguments>
9596
<comment userInput="clickAndValidateGoogleMapsAPIKeyTestKeyButton" stepKey="comment"/>
9697
<waitForElementVisible selector="{{ContentManagementSection.GoogleMapsAPIKeyTestKeyButton}}" stepKey="waitForTestKeyButtonEnabled"/>
9798
<click selector="{{ContentManagementSection.GoogleMapsAPIKeyTestKeyButton}}" stepKey="clickTestKeyButton"/>
9899
<waitForPageLoad stepKey="waitForPageLoad"/>
99-
<waitForElementVisible selector="{{ContentManagementSection.GoogleMapsAPIKeyTestKeyResult(expectedResult)}}" stepKey="waitForTestKeyButtonResult"/>
100+
<waitForElementVisible selector="{{ContentManagementSection.GoogleMapsAPIKeyTestKeyResult}} .icon-admin-pagebuilder-{{expectedResult}}" stepKey="waitForTestKeyButtonResult"/>
101+
<see userInput="{{buttonText}}" selector="{{ContentManagementSection.GoogleMapsAPIKeyTestKeyResult}}" stepKey="seeTestKeyButtonText"/>
100102
</actionGroup>
101103
<actionGroup name="inputGoogleMapsStyle">
102104
<arguments>

app/code/Magento/PageBuilder/Test/Mftf/Data/CmsConfigData.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@
1313
<data key="row">row_cms_pagebuilder_google_maps_api_key</data>
1414
<data key="label">Google Maps API Key</data>
1515
<data key="default"/>
16-
<data key="valid">AIzaSyCw10cOO31cpxb2bcwnHPHKtxov8oUbxJw</data>
16+
<data key="valid">AIzaSyA7TbgpW4U9yKFNzJmHPwLUh_bWt9nXBl4</data>
1717
<data key="invalidOneCharacter">a</data>
18-
<data key="invalidOneCharacterOffOfValid">aIzaSyCw10cOO31cpxb2bcwnHPHKtxov8oUbxJw</data>
18+
<data key="invalidOneCharacterOffOfValid">aIzaSyA7TbgpW4U9yKFNzJmHPwLUh_bWt9nXBl4</data>
1919
<data key="empty"/>
2020
<data key="warningMessage">You must provide the Google Maps API key in order to use the map</data>
21+
<data key="keyButtonText">Test Key</data>
22+
<data key="invalidKeyButtonText">Key is invalid. Try a different key.</data>
23+
<data key="validKeyButtonText">Key is valid</data>
2124
</entity>
2225
<entity name="googleMapsStyle" type="config">
2326
<data key="section">cms_pagebuilder</data>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<entity name="PageBuilderMapCommonData" type="pagebuilder__map_common_data">
2525
<data key="mapErrorTitleStorefront">Oops! Something went wrong.</data>
2626
<data key="mapErrorMessageStorefront">This page didn't load Google Maps correctly. See the JavaScript console for technical details.</data>
27-
<data key="mapErrorMessageStage">Enter valid API Key to use Google Maps</data>
27+
<data key="mapErrorMessageAdmin">Enter valid API Key to use Google Maps</data>
2828
</entity>
2929
<!-- Map Position -->
3030
<entity name="PageBuilderMapPositionDefaultProperty" type="pagebuilder_map_position_property">

app/code/Magento/PageBuilder/Test/Mftf/Section/ContentManagementSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<element name="ConfigurationFieldLabel" type="button" selector="//div[contains(@class,'form-inline')]//fieldset[@id='{{arg1}}']//tr[@id='{{arg2}}']//span[.='{{arg3}}']" parameterized="true"/>
2121
<element name="GoogleMapsAPIKeyInputField" type="input" selector="#cms_pagebuilder_google_maps_api_key"/>
2222
<element name="GoogleMapsAPIKeyTestKeyButton" type="button" selector="#cms_pagebuilder_google_maps_api_key_validator"/>
23-
<element name="GoogleMapsAPIKeyTestKeyResult" type="button" selector="#cms_pagebuilder_google_maps_api_key_validator .result .icon-admin-pagebuilder-{{arg1}}" parameterized="true"/>
23+
<element name="GoogleMapsAPIKeyTestKeyResult" type="button" selector="#cms_pagebuilder_google_maps_api_key_validator .result"/>
2424
<element name="GoogleMapsAPIKeyHelperText" type="text" selector="#row_cms_pagebuilder_google_maps_api_key .value .note span"/>
2525
<element name="GoogleMapsGetAPIKeyLink" type="button" selector="#row_cms_pagebuilder_google_maps_api_key a[href]"/>
2626
<element name="GoogleMapsStyleInputField" type="input" selector="#cms_pagebuilder_google_maps_style"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,7 @@
117117
<element name="fullScreen" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//button[@title='Toggle fullscreen view'])[{{arg1}}]" parameterized="true"/>
118118
<element name="zoomIn" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//button[@title='Zoom in'])[{{arg1}}]" parameterized="true"/>
119119
<element name="zoomOut" type="button" selector="(//div[@data-index='position']//div[@class='map-field']//button[@title='Zoom out'])[{{arg1}}]" parameterized="true"/>
120+
<!-- Map Error Message -->
121+
<element name="errorContainer" type="text" selector="(//div[@data-index='position']//div[@class='map-field']//div[@class='google-map-auth-failure-placeholder'])[{{arg1}}]" parameterized="true"/>
120122
</section>
121123
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
1212
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
1313
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
14-
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key {{googleMapsAPIKey.valid}}" stepKey="setValidGoogleMapsAPIKey"/>
14+
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key {{googleMapsAPIKey.invalidOneCharacter}}" stepKey="setInvalidGoogleMapsAPIKey"/>
1515
</before>
1616
<after>
1717
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>

0 commit comments

Comments
 (0)