Merge pull request #48 from magento-arcticfoxes/B2B-1953

B2B-1953: correct directory filter

Author: joanhe

AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockExpandImagePreviewActionGroup.xml

@@ -9,7 +9,9 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAdobeStockExpandImagePreviewActionGroup">
+        <conditionalClick stepKey="closeImagePreview" selector="{{AdobeStockImagePreviewSection.close}}" dependentSelector="{{AdobeStockImagePreviewSection.close}}" visible="true"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToClose"/>
         <click selector="{{AdobeStockSection.modal}} {{AdobeStockSection.firstImageInGrid}}" stepKey="clickOnThumbnail"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForImagePreviewToExpand"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
     </actionGroup>
 </actionGroups>

AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminSearchImagesOnModalActionGroup.xml

@@ -14,6 +14,6 @@
         </arguments>
         <fillField selector="{{AdobeStockSection.searchInput}}" userInput="{{query}}" stepKey="fillQueryInput"/>
         <click selector="{{AdobeStockSection.searchButton}}" stepKey="applySearch"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForSearchForQuery"/>
+        <waitForPageLoad stepKey="waitForSearchForQuery"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>

AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml

@@ -14,6 +14,7 @@
         <element name="openInMediaGallery" type="block" selector="//button[@class='action-secondary']//span[text()='Open in Media Gallery']"/>
         <element name="saveLicensedImage" type="button" selector="//button[@class='action-default primary']//span[text()='Save Licensed']"/>
         <element name="image" type="block" selector="//div[@class='masonry-image-preview']//img"/>
+        <element name="close" type="button" selector="//div[@class='masonry-image-preview']//button[@class='action-close']"/>
         <element name="navigation" type="button" selector="//div[@class='masonry-image-preview']//div[contains(@class, 'action-buttons')]/button[@class='action-{{type}}']" parameterized="true"/>
         <element name="attribute" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@data-role='image-attributes-value']//span[text()='{{type}}']/parent::div//div[@class='value']//span" parameterized="true"/>
         <element name="attributeTitle" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@data-role='image-attributes-value']//span[text()='{{title}}']" parameterized="true"/>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml

@@ -32,15 +32,15 @@
             <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
         </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandsFirstImageInGrid"/>
-        <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>
+        <waitForPageLoad stepKey="waitForRelatedImagesToLoad"/>
         <click selector="{{AdobeStockImagePreviewSection.moreFromThisSeriesSeeMore}}" stepKey="clickOnTabMoreForThisModel"/>
-        <wait stepKey="waitForScrollUp" time="5"/>
-        <seeElement selector="{{AdobeStockSection.searchInput}}" stepKey="seeSearchInput"/>
+        <waitForPageLoad stepKey="waitForScrollUp"/>
+        <waitForElementVisible selector="{{AdobeStockSection.searchInput}}" stepKey="seeSearchInput"/>
 
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandsFirstImageInGridSecondTime"/>
-        <waitForAjaxLoad stepKey="waitForRelatedImagesToLoadSecondTime"/>
+        <waitForPageLoad stepKey="waitForRelatedImagesToLoadSecondTime"/>
         <click selector="{{AdobeStockImagePreviewSection.moreFromThisSeriesSeeMore}}" stepKey="clickOnTabMoreForThisModelSecondTime"/>
-        <wait stepKey="waitForScrollUpSecondTime" time="5"/>
-        <seeElement selector="{{AdobeStockSection.searchInput}}" stepKey="seeSearchInputSecondTime"/>
+        <waitForPageLoad stepKey="waitForScrollUpSecondTime"/>
+        <waitForElementVisible selector="{{AdobeStockSection.searchInput}}" stepKey="seeSearchInputSecondTime"/>
     </test>
 </tests>