ACQE-4703 CheckDisplayingOfApostrophesInTheTextFieldBoxWhileCreatingPageWidgetTest

- code review comments addressed - duplicate element removed and elements renamed with proper naming convention

Author: Manoranjan.Prakash

app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml

@@ -23,6 +23,5 @@
         <element name="spinner" type="input" selector='//div[@data-component="cms_page_form.cms_page_form"]' />
         <element name="saveAndClose" type="button" selector="#save_and_close" timeout="10"/>
         <element name="insertWidget" type="button" selector="//span[contains(text(),'Insert Widget...')]"/>
-        <element name="savePageBtn" type="button" selector="//button[@id='save-button']" timeout="10"/>
     </section>
 </sections>

app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml

@@ -16,6 +16,6 @@
         <element name="mainContent" type="text" selector="#maincontent"/>
         <element name="footerTop" type="text" selector="footer.page-footer"/>
         <element name="title" type="text" selector="//div[@class='breadcrumbs']//ul/li[@class='item cms_page']"/>
-        <element name="widgetContent_Apostrophe" type="text" selector="//div[@class='widget block block-cms-link']//span[contains(text(),'{{var}}')]" parameterized="true"/>
+        <element name="widgetContentApostrophe" type="text" selector="//div[@class='widget block block-cms-link']//span[contains(text(),'{{var}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/WidgetSection.xml

@@ -48,8 +48,8 @@
         <element name="ChooserName" type="input" selector="input[name='chooser_name']"/>
         <element name="SelectPageButton" type="button" selector="//button[@title='Select Page...']"/>
         <element name="SelectPageFilterInput" type="input" selector="input.admin__control-text[name='{{filterName}}']" parameterized="true"/>
-        <element name="url_key_selectPage" type="input" selector="//aside[@role='dialog']//input[@name='chooser_identifier']"/>
-        <element name="SearchButton_selectPage" type="button" selector="//aside[@role='dialog']//button[@title='Search']"/>
-        <element name="search_result_selectPage" type="text" selector="//aside[@role='dialog']//td[contains(@class,'col-url col-chooser_identifier') and contains(text(),'{{var}}')]" parameterized="true"/>
+        <element name="URLKeySelectPage" type="input" selector="//aside[@role='dialog']//input[@name='chooser_identifier']"/>
+        <element name="SearchButtonSelectPage" type="button" selector="//aside[@role='dialog']//button[@title='Search']"/>
+        <element name="SearchResultSelectPage" type="text" selector="//aside[@role='dialog']//td[contains(@class,'col-url col-chooser_identifier') and contains(text(),'{{var}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Widget/Test/Mftf/Test/CheckDisplayingOfApostrophesInTheTextFieldBoxWhileCreatingPageWidgetTest.xml

@@ -21,75 +21,66 @@
         <before>
             <!-- Pre-condition 1- Login as Admin  -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-
             <!-- Pre-condition - Disable the page builder -->
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
-
+            <magentoCLI stepKey="reindexingPostDisablingThePageBuilder" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCachePostDisablingThePageBuilder" command="cache:flush"/>
             <!-- Pre-condition 3- Verify page in grid-->
             <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="openCMSPagesGridActionGroup"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
             <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortGridByIdDescending"/>
             <click selector="{{CmsPagesPageActionsSection.select('home')}}" stepKey="clickSelectCMSPage" />
-
             <!-- Pre-condition 4- Update the page in grid-->
             <click selector="{{CmsPagesPageActionsSection.edit('home')}}" stepKey="OpenThePageToBeEdited"/>
             <waitForPageLoad stepKey="waitForPageLoadPostSelectingHomePage"/>
             <waitForElementVisible selector="{{CmsNewPagePageContentSection.header}}" stepKey="waitForContentTabForPageToBeVisible"/>
-
             <!-- Pre-condition 5- Expand the Content section > Insert Widget -->
             <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPage"/>
             <waitForElementVisible selector="{{CmsNewPagePageActionsSection.insertWidget}}" stepKey="waitForTheInsertWidgetButtonToDisplay"/>
-            <actionGroup ref="AdminInsertWidgetToCmsPageContentActionGroup" stepKey="selectCMSpageLinkFromDropdown"/>
+            <actionGroup ref="AdminInsertWidgetToCmsPageContentActionGroup" stepKey="selectCMSPageLinkFromDropdown"/>
             <waitForPageLoad stepKey="waitForPageLoadPostSelectingFromDropDown"/>
-
             <!-- Pre-condition 6 - 11 - Update the Anchor Custom Text -->
             <fillField selector="{{WidgetSection.InputAnchorCustomText}}" userInput="Custom texts&apos; for tests" stepKey="InputValuesWithApostrophe"/>
             <click selector="{{WidgetSection.SelectPageButton}}" stepKey="clickOnSelectPageButton"/>
-            <waitForElementVisible selector="{{WidgetSection.url_key_selectPage}}" stepKey="waitForSelectPageDialogToPopulate"/>
-            <fillField selector="{{WidgetSection.url_key_selectPage}}" userInput="home" stepKey="EnterThePageURL"/>
-            <click selector="{{WidgetSection.SearchButton_selectPage}}" stepKey="clickOnSearchButton"/>
+            <waitForElementVisible selector="{{WidgetSection.URLKeySelectPage}}" stepKey="waitForSelectPageDialogToPopulate"/>
+            <fillField selector="{{WidgetSection.URLKeySelectPage}}" userInput="home" stepKey="EnterThePageURL"/>
+            <click selector="{{WidgetSection.SearchButtonSelectPage}}" stepKey="clickOnSearchButton"/>
             <waitForPageLoad stepKey="waitForResultsToBeDisplayed"/>
-            <click selector="{{WidgetSection.search_result_selectPage('home')}}" stepKey="clickOnDisplayedResult"/>
+            <click selector="{{WidgetSection.SearchResultSelectPage('home')}}" stepKey="clickOnDisplayedResult"/>
             <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidget"/>
-            <waitForElementVisible selector="{{CmsNewPagePageActionsSection.savePageBtn}}" stepKey="waitForInsertWidgetDialogToDisappear" time="5"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePageBtn}}" stepKey="clickSavePage"/>
+            <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForInsertWidgetDialogToDisappear" time="5"/>
+            <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSavePage"/>
             <waitForElementVisible selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="waitForSuccessMessageLoggedOut" time="5"/>
             <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
-
         </before>
         <after>
             <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="openCMSPagesGridActionGroupToReset"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFiltersToReset"/>
             <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortGridByIdDescendingToReset"/>
             <click selector="{{CmsPagesPageActionsSection.select('home')}}" stepKey="clickSelectCMSPageToReset" />
-
             <!-- Pre-condition 4- Update the page in grid To Reset-->
             <click selector="{{CmsPagesPageActionsSection.edit('home')}}" stepKey="OpenThePageToBeEditedToReset"/>
             <waitForPageLoad stepKey="waitForPageLoadPostSelectingHomePageToReset"/>
             <waitForElementVisible selector="{{CmsNewPagePageContentSection.header}}" stepKey="waitForContentTabForPageToBeVisibleToReset"/>
-
             <!-- Pre-condition 5- Expand the Content section > Insert Widget To Reset -->
             <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPageToReset"/>
             <waitForElementVisible selector="{{CmsNewPagePageActionsSection.insertWidget}}" stepKey="waitForTheInsertWidgetButtonToDisplayToReset"/>
             <clearField selector="{{CmsNewPagePageContentSection.content}}" stepKey="clearWidgetTextFieldToReset"/>
             <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="&lt;p&gt;CMS homepage content goes here.&lt;/p&gt;" stepKey="InputDefaultValuesInWidgetTextFieldToReset"/>
-            <waitForElementVisible selector="{{CmsNewPagePageActionsSection.savePageBtn}}" stepKey="waitForInsertWidgetDialogToDisappearToReset" time="5"/>
-            <click selector="{{CmsNewPagePageActionsSection.savePageBtn}}" stepKey="clickSavePageToReset"/>
+            <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForInsertWidgetDialogToDisappearToReset" time="5"/>
+            <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSavePageToReset"/>
             <waitForElementVisible selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="waitForSuccessMessageLoggedOutToReset" time="5"/>
             <see userInput="You saved the page." stepKey="seeSuccessMessageToReset"/>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <magentoCLI stepKey="reindexPostEnablingThePageBuilder" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCachePostEnablingThePageBuilder" command="cache:flush"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="navigateToHomePage"/>
         <waitForPageLoad stepKey="waitToLoadHomePage"/>
-        <grabTextFrom selector="{{StorefrontCMSPageSection.widgetContent_Apostrophe('Custom texts')}}" stepKey="grabContentFromWidget"/>
-
+        <grabTextFrom selector="{{StorefrontCMSPageSection.widgetContentApostrophe('Custom texts')}}" stepKey="grabContentFromWidget"/>
         <assertEquals message="Asserts the widget contains apostrophe On storefront" stepKey="assertApostropheOnWidgetText">
             <expectedResult type="string">Custom texts' for tests</expectedResult>
             <actualResult type="string">{$grabContentFromWidget}</actualResult>