ACP2E-4208: "Confirm Form Resubmission" on Catalog Search with "Remember Category Pagination"

Author: katmoon

app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontSearchSetDefaultDisplaySettingsActionGroup.xml

@@ -10,9 +10,12 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontSearchSetDefaultDisplaySettingsActionGroup">
         <annotations>
-            <description>Sets search display to default settings: grid mode, relevance descending, 12 items per page</description>
+            <description>Sets search display to default settings: grid mode, relevance descending, 12 items per page. Fails if not on search results page.</description>
         </annotations>
 
+        <!-- Check if we're on the search results page -->
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="verifyOnSearchPage"/>
+
         <!-- Set display mode to grid (default) -->
         <click selector="{{StorefrontSearchTopToolbarSection.gridMode}}" stepKey="selectGridMode"/>
         <waitForPageLoad stepKey="waitForGridModeApplied"/>

app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontSearchTopToolbarSection.xml

@@ -10,11 +10,11 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontSearchTopToolbarSection">
         <element name="searchResultsToolbar" type="block" selector=".toolbar.toolbar-products" timeout="30"/>
-        <element name="gridMode" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//*[@data-value='grid']" timeout="30"/>
-        <element name="listMode" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//*[@data-value='list']" timeout="30"/>
-        <element name="sortByDropdown" type="select" selector=".catalogsearch-result-index .toolbar-products #sorter" timeout="30"/>
-        <element name="sortDirectionAsc" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//a[contains(@class, 'sort-asc')]" timeout="30"/>
-        <element name="sortDirectionDesc" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//a[contains(@class, 'sort-desc')]" timeout="30"/>
-        <element name="showDropdown" type="select" selector=".catalogsearch-result-index .toolbar-products #limiter" timeout="30"/>
+        <element name="gridMode" type="button" selector=".toolbar.toolbar-products .modes .mode-grid" timeout="30"/>
+        <element name="listMode" type="button" selector=".toolbar.toolbar-products .modes .mode-list" timeout="30"/>
+        <element name="sortByDropdown" type="select" selector=".toolbar.toolbar-products .sorter #sorter" timeout="30"/>
+        <element name="sortDirectionAsc" type="button" selector=".toolbar.toolbar-products .sorter a.sort-asc" timeout="30"/>
+        <element name="sortDirectionDesc" type="button" selector=".toolbar.toolbar-products .sorter a.sort-desc" timeout="30"/>
+        <element name="showDropdown" type="select" selector=".toolbar.toolbar-products .limiter #limiter" timeout="30"/>
     </section>
 </sections>

app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontSearchToolbarTest.xml

@@ -122,5 +122,22 @@
         <see userInput="StorefrontSearchToolbarTestProduct C" selector="{{StorefrontCategoryMainSection.productNameByPosition('1')}}" stepKey="finalVerifyProductCFirst"/>
         <see userInput="StorefrontSearchToolbarTestProduct B" selector="{{StorefrontCategoryMainSection.productNameByPosition('2')}}" stepKey="finalVerifyProductBSecond"/>
         <see userInput="StorefrontSearchToolbarTestProduct A" selector="{{StorefrontCategoryMainSection.productNameByPosition('3')}}" stepKey="finalVerifyProductAThird"/>
+
+        <!-- Step 8: Verify sorting functionality still works after back button navigation -->
+        <comment userInput="Test that sorting functionality is still operational after back button navigation" stepKey="commentTestSortingStillWorks"/>
+
+        <!-- Change sort direction to ascending to test sorting still works -->
+        <click selector="{{StorefrontSearchTopToolbarSection.sortDirectionDesc}}" stepKey="changeSortToAscendingAfterBack"/>
+        <waitForPageLoad stepKey="waitForAscendingSortingAfterBack"/>
+
+        <!-- Verify Product A is now first (alphabetically first in ascending order) -->
+        <see userInput="StorefrontSearchToolbarTestProduct A" selector="{{StorefrontCategoryMainSection.productNameByPosition('1')}}" stepKey="verifyProductAFirstAfterSortChange"/>
+
+        <!-- Change sort back to price to test different sorting option -->
+        <selectOption selector="{{StorefrontSearchTopToolbarSection.sortByDropdown}}" userInput="price" stepKey="selectSortByPriceAfterBack"/>
+        <waitForPageLoad stepKey="waitForPriceSortingAfterBack"/>
+
+        <!-- Verify Product B is first (lowest price $10.00) -->
+        <see userInput="StorefrontSearchToolbarTestProduct B" selector="{{StorefrontCategoryMainSection.productNameByPosition('1')}}" stepKey="verifyProductBFirstByPriceAfterBack"/>
     </test>
 </tests>