Merge remote-tracking branch 'origin/develop' into PB-369-Integrate-third-party-library

Author: cspruiell

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

@@ -182,14 +182,13 @@
             <description>Opens the Page Builder Apply Template slide out from the Page Builder stage.</description>
         </annotations>
         <arguments>
-            <argument name="title" defaultValue="Apply Template" type="string"/>
             <argument name="pageBuilderArea" defaultValue="" type="string"/>
         </arguments>
         <waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.applyTemplateButton}}" stepKey="waitForApplyTemplateButton"/>
         <click selector="{{pageBuilderArea}}{{PageBuilderStage.applyTemplateButton}}" stepKey="clickApplyTemplateButton"/>
         <waitForPageLoad stepKey="waitForSlideOutLoad"/>
         <waitForElementVisible selector="{{PageBuilderApplyTemplateSlideOut.activeSlideOut}}" stepKey="waitForSlideOut"/>
-        <see userInput="{{title}}" selector="{{PageBuilderApplyTemplateSlideOut.title}}" stepKey="seeTitle"/>
+        <see userInput="Apply Template" selector="{{PageBuilderApplyTemplateSlideOut.title}}" stepKey="seeTitle"/>
         <waitForPageLoad stepKey="waitForSlideOutForm"/>
     </actionGroup>
     <actionGroup name="closePageBuilderApplyTemplateSlideOut">

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

@@ -39,7 +39,7 @@
         <!-- Save Template -->
         <actionGroup ref="openPageBuilderSaveTemplateModal" stepKey="openPageBuilderSaveTemplateModal"/>
         <actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateForm"/>
-        <generateDate date="now" format="M d, Y g:" stepKey="today"/>
+        <generateDate date="now" format="M j, Y g:" stepKey="today"/>
         <generateDate date="now" format="A" stepKey="todayAMorPM"/>
         <actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate"/>
         <!-- Verify Info on Apply Template Slide Out -->
@@ -233,7 +233,7 @@
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
         <actionGroup ref="openPageBuilderSaveTemplateModal" stepKey="openPageBuilderSaveTemplateModal"/>
         <actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateForm"/>
-        <generateDate date="now" format="M d, Y g:" stepKey="today"/>
+        <generateDate date="now" format="M j, Y g:" stepKey="today"/>
         <generateDate date="now" format="A" stepKey="todayAMorPM"/>
         <actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate"/>
         <!-- Verify Info on Template Grid Page -->
@@ -706,7 +706,7 @@
         <actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateFormCommonCharacters">
             <argument name="templateName" value="{{PageBuilderTemplateName_EdgeCases.commonCharacters}}"/>
         </actionGroup>
-        <generateDate date="now" format="M d, Y g:" stepKey="today"/>
+        <generateDate date="now" format="M j, Y g:" stepKey="today"/>
         <generateDate date="now" format="A" stepKey="todayAMorPM"/>
         <actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplateZeroCommonCharacters"/>
         <!-- Validate Common Characters Template -->