B2B-1876: New directories in pub/media do not get synced back to local filesystem from S3 Remote Storage

 - Fixing mftf tests

Author: dhaecker

app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminResetDataGridToDefaultViewActionGroup.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminResetDataGridToDefaultViewActionGroup">
+        <annotations>
+            <description>Resets an Admin Grid page to the 'Default View'.</description>
+        </annotations>
+        <arguments>
+            <argument name="index" type="string" defaultValue="1"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{AdminDataGridHeaderSection.bookmarkToggleByIndex(index)}}" stepKey="waitForViewBookmarks"/>
+        <click selector="{{AdminDataGridHeaderSection.bookmarkToggleByIndex(index)}}" stepKey="openViewBookmarks"/>
+        <click selector="{{AdminDataGridHeaderSection.bookmarkOptionByIndex(index, DefaultGridView.name)}}" stepKey="selectDefaultGridView"/>
+        <waitForPageLoad stepKey="waitForGridReset"/>
+        <see selector="{{AdminDataGridHeaderSection.bookmarkToggleByIndex(index)}}" userInput="{{DefaultGridView.name}}" stepKey="seeDefaultViewSelected"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml

@@ -21,7 +21,9 @@
         <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
         <!--Grid view bookmarks-->
         <element name="bookmarkToggle" type="button" selector="div.admin__data-grid-action-bookmarks button[data-bind='toggleCollapsible']" timeout="30"/>
+        <element name="bookmarkToggleByIndex" type="button" selector="(//div[contains(@class,'admin__data-grid-action-bookmarks')])[{{index}}]//button[@data-bind='toggleCollapsible']" parameterized="true" timeout="30"/>
         <element name="bookmarkOption" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="bookmarkOptionByIndex" type="button" selector="(//div[contains(@class, 'admin__data-grid-action-bookmarks')])[{{index}}]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <!--Visible columns management-->
         <element name="columnsToggle" type="button" selector="div.admin__data-grid-action-columns button[data-bind='toggleCollapsible']" timeout="30"/>
         <element name="columnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>