Merge remote-tracking branch 'origin/MC-4138-flaky-mftf-test-StoreConfigurationGoogleMapsStyleFieldAppearance' into cms-team-1-delivery

Author: cspruiell

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

@@ -125,6 +125,7 @@
         <comment userInput="Go To AdminContentManagementPage" stepKey="commentGoToPage"/>
         <actionGroup ref="navigateToAdminContentManagementPage" stepKey="navigateToAdminContentManagementPage"/>
         <conditionalClick stepKey="expandAdvancedContentTools" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <!-- Validate Global Scope -->
         <comment userInput="Validate Global Scope" stepKey="commentValidateGlobal"/>
         <waitForElementVisible selector="{{ContentManagementSection.ConfigurationFieldLabel(googleMapsAPIKey.section, googleMapsAPIKey.row, googleMapsAPIKey.label)}}[@data-config-scope='[GLOBAL]']" stepKey="waitForConfigurationKeyScope"/>
@@ -140,8 +141,8 @@
         <comment userInput="Validate Get API Key Link" stepKey="commentValidateLink"/>
         <waitForElementVisible selector="{{ContentManagementSection.GoogleMapsGetAPIKeyLink}}" stepKey="waitForLink"/>
         <click selector="{{ContentManagementSection.GoogleMapsGetAPIKeyLink}}" stepKey="clickLink"/>
+        <wait time="2" stepKey="waitForTabCreation"/>
         <switchToNextTab stepKey="switchToNextTab"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
         <seeCurrentUrlEquals url="https://developers.google.com/maps/documentation/javascript/get-api-key" stepKey="validateURL"/>
     </test>
     <test name="StoreConfigurationGoogleMapsAPIKeyTestKeyButtonValidKey">

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

@@ -19,9 +19,6 @@
             <testCaseId value="MC-2859"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-googleMapsStyle"/>
-            <skip>
-                <issueId value="MC-4257"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -34,6 +31,7 @@
         <comment userInput="Go To AdminContentManagementPage" stepKey="commentGoToPage"/>
         <actionGroup ref="navigateToAdminContentManagementPage" stepKey="navigateToAdminContentManagementPage"/>
         <conditionalClick stepKey="expandAdvancedContentTools" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <!-- Validate Global Scope -->
         <comment userInput="Validate Global Scope" stepKey="commentValidateGlobal"/>
         <waitForElementVisible selector="{{ContentManagementSection.ConfigurationFieldLabel(googleMapsStyle.section, googleMapsStyle.row, googleMapsStyle.label)}}[@data-config-scope='[GLOBAL]']" stepKey="waitForConfigurationKeyScope"/>
@@ -45,6 +43,7 @@
         <comment userInput="Validate Create Map Style Link" stepKey="commentValidateLink"/>
         <waitForElementVisible selector="{{ContentManagementSection.GoogleMapsCreateMapStyleLink}}" stepKey="waitForLink"/>
         <click selector="{{ContentManagementSection.GoogleMapsCreateMapStyleLink}}" stepKey="clickLink"/>
+        <wait time="2" stepKey="waitForTabCreation"/>
         <switchToNextTab stepKey="switchToNextTab"/>
         <seeCurrentUrlEquals url="https://mapstyle.withgoogle.com/" stepKey="validateURL"/>
     </test>