Merge pull request #120 from magento-cia/cia-pre-release-develop-sync-02162024

sidolov · web-flow · commit b322ae26d8d5 · 2024-02-17T18:26:09.000-06:00
Cia pre release develop sync 02162024
diff --git a/AdobeStockImage/Test/Mftf/Test/StorefrontAdobeStockIntegrationApiSwaggerActionsExistTest.xml b/AdobeStockImage/Test/Mftf/Test/StorefrontAdobeStockIntegrationApiSwaggerActionsExistTest.xml
@@ -17,7 +17,7 @@
             <severity value="CRITICAL"/>
             <group value="developer_mode_only"/>
             <skip>
-                <issueId value="ACQE-4803">To be converted to WebApi test</issueId>
+                <issueId value="ACQE-4803">To be converted to WebApi test. This test should not be in adobe-stock-integration. It contains references that originate in the security-package repository. The test should be moved out of this repository when it is replaced by an integration test</issueId>
             </skip>
         </annotations>
         <before>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockClickLicenseActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockClickLicenseActionGroup.xml
@@ -9,7 +9,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAdobeStockClickLicenseActionGroup">
         <click selector="{{AdminAdobeStockImagePreviewSection.saveLicensedImage}}" stepKey="clickOnSavePreview"/>
-        <waitForElementVisible selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmationModal"/>
+        <waitForElementClickable selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmationModal"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickConfirmButton"/>
         <waitForPageLoad stepKey="waitForMaskDisappeared"/>
     </actionGroup>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminDeleteAdobeStockImagePreviewActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminDeleteAdobeStockImagePreviewActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminDeleteSelectedAdobeStockImagePreviewActionGroup">
         <click selector="{{AdminAdobeStockSection.deleteMediaButton}}" stepKey="clickDeleteMedia"/>
-        <waitForElementVisible selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmationModal"/>
+        <waitForElementClickable selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmationModal"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickConfirmButton"/>
         <waitForPageLoad stepKey="waitForDeletionPageLoad"/>
     </actionGroup>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml
@@ -21,7 +21,7 @@
             stepKey="clickImageToDeleteAgain"/>
         <waitForElementVisible selector="{{AdminAdobeStockSection.mediaGalleryDeleteButton}}" stepKey="waitForDeleteButton"/>
         <click selector="{{AdminAdobeStockSection.mediaGalleryDeleteButton}}" stepKey="clickDeleteButton"/>
-        <waitForElementVisible selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmationModal"/>
+        <waitForElementClickable selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmationModal"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickConfirmButton"/>
         <waitForPageLoad stepKey="waitForMaskDisappeared"/>
         <dontSeeElement selector="{{AdminAdobeStockSection.mediaGalleryImage(name)}}" stepKey="assertImageIsDeleted"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminSaveAdobeStockImagePreviewActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminSaveAdobeStockImagePreviewActionGroup.xml
@@ -14,7 +14,9 @@
         </arguments>
         <waitForElementVisible selector="{{AdminAdobeStockSaveImagePreviewSection.name}}" time="30" stepKey="waitForInputVisible"/>
         <fillField selector="{{AdminAdobeStockSaveImagePreviewSection.name}}" userInput="{{name}}" stepKey="setImageName"/>
+        <waitForElementClickable selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmButtonClickable"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="confirmSavingThePreview"/>
         <waitForPageLoad stepKey="waitForImagePreviewToSave"/>
+        <dontSeeElementInDOM selector="{{AdminAdobeStockImagePreviewSection.errorMessage}}" stepKey="verifyNoErrorMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminSaveAdobeStockImagePreviewAndDontCheckForErrorActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminSaveAdobeStockImagePreviewAndDontCheckForErrorActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+* ADOBE CONFIDENTIAL
+*
+* Copyright 2024 Adobe
+* All Rights Reserved.
+*
+* NOTICE: All information contained herein is, and remains
+* the property of Adobe and its suppliers, if any. The intellectual
+* and technical concepts contained herein are proprietary to Adobe
+* and its suppliers and are protected by all applicable intellectual
+* property laws, including trade secret and copyright laws.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe.
+*/
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSaveAdobeStockImagePreviewAndDontCheckForErrorActionGroup" extends="AdminSaveAdobeStockImagePreviewActionGroup">
+        <remove keyForRemoval="verifyNoErrorMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminSaveAdobeStockLicensedImageActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminSaveAdobeStockLicensedImageActionGroup.xml
@@ -9,8 +9,8 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSaveAdobeStockLicensedImageActionGroup">
-        <waitForElementVisible selector="{{AdminAdobeStockSaveImagePreviewSection.name}}" time="30" stepKey="waitForInputVisible"/>
+        <waitForElementClickable selector="{{AdminAdobeStockSaveImagePreviewSection.name}}" time="30" stepKey="waitForInputVisible"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="confirmSavingLicensed"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForImageToSave"/>
+        <waitForPageLoad stepKey="waitForImageToSave"/>
     </actionGroup>
 </actionGroups>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml
@@ -36,5 +36,6 @@
         <element name="moreFromThisSeriesSeeMore" selector="//div[@aria-labelledby='series_tab']//div[@class='see-more-wrapper']" type="button"/>
         <element name="seeMoreFromSeriesImages" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='see-more-wrapper']"/>
         <element name="imagePreviewTitle" type="text" selector=".preview-row-content .title"/>
+        <element name="errorMessage" type="text" selector="//div[@data-ui-id='messages-message-error']"/>
     </section>
 </sections>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewLocateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewLocateTest.xml
@@ -56,8 +56,10 @@
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="clickSavePreviewButton"/>
         <comment userInput="BIC workaround" stepKey="waitForPromptModal"/>
         <grabValueFrom selector="{{AdminAdobeStockImagePreviewSection.imageNameField}}" stepKey="grabImageFileName"/>
+        <waitForElementClickable selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmButtonClickable"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
         <waitForPageLoad stepKey="waitForMediaGalleryOpen"/>
+        <dontSeeElementInDOM selector="{{AdminAdobeStockImagePreviewSection.errorMessage}}" stepKey="verifyNoErrorMessage"/>
         <waitForElementVisible selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage"/>
         <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanelAgain"/>
         <actionGroup ref="AdminAdobeStockImagePreviewLocateActionGroup" stepKey="locateImage"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockListingStateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockListingStateTest.xml
@@ -61,8 +61,10 @@
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="clickSavePreview"/>
         <comment userInput="BIC workaround" stepKey="waitForPromptModal"/>
         <grabValueFrom selector="{{AdminAdobeStockImagePreviewSection.imageNameField}}" stepKey="grabImageFileName"/>
+        <waitForElementClickable selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmButtonClickable"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
         <waitForPageLoad stepKey="waitForMediaGalleryOpen" />
+        <dontSeeElementInDOM selector="{{AdminAdobeStockImagePreviewSection.errorMessage}}" stepKey="verifyNoErrorMessage"/>
         <waitForElementVisible selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage"/>
         <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
         <actionGroup ref="AssertAdminAdobeStockCurrentPageNumberActionGroup" stepKey="seeSecondPage">
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSaveLicensedTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSaveLicensedTest.xml
@@ -39,8 +39,10 @@
         <click selector="{{AdminAdobeStockImagePreviewSection.saveLicensedImage}}" stepKey="clickSave"/>
         <waitForPageLoad stepKey="waitForPromptModal" />
         <grabValueFrom selector="{{AdminAdobeStockImagePreviewSection.imageNameField}}" stepKey="grabImageFileName" />
+        <waitForElementClickable selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmButtonClickable"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
         <waitForPageLoad stepKey="waitForMediaGalleryOpen" />
+        <dontSeeElementInDOM selector="{{AdminAdobeStockImagePreviewSection.errorMessage}}" stepKey="verifyNoErrorMessage"/>
         <seeElement selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage" />
         <actionGroup ref="AdminMediaGalleryDeleteImage" stepKey="deleteImageActionGroup">
             <argument name="name" value="{$grabImageFileName}"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml
@@ -42,8 +42,10 @@
         <click selector="{{AdminAdobeStockImagePreviewSection.saveLicensedImage}}" stepKey="clickSave"/>
         <waitForPageLoad stepKey="waitForPromptModal"/>
         <grabValueFrom selector="{{AdminAdobeStockImagePreviewSection.imageNameField}}" stepKey="grabSaveImageFileName"/>
+        <waitForElementClickable selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmButtonClickable"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
         <waitForPageLoad stepKey="waitForMediaGalleryOpen"/>
+        <dontSeeElementInDOM selector="{{AdminAdobeStockImagePreviewSection.errorMessage}}" stepKey="verifyNoErrorMessage"/>
         <seeElement selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabSaveImageFileName})}}" stepKey="imageSaved"/>
         <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanelAgain"/>
         <actionGroup ref="AdminAdobeStockImagePreviewLocateActionGroup" stepKey="locateImage"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml
@@ -40,7 +40,7 @@
         <click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
         <waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
-        <actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview"/>
+        <actionGroup ref="AdminSaveAdobeStockImagePreviewAndDontCheckForErrorActionGroup" stepKey="confirmSaveImagePreview"/>
         <waitForText userInput="Could not save image: destination directory is restricted." stepKey="waitForErrorMessage"/>
 
         <!-- Verify Can Save Adobe Stock Preview Under Wysiwyg -->
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryPageSavedPreviewAddSelectedTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryPageSavedPreviewAddSelectedTest.xml
@@ -48,6 +48,9 @@
             <comment userInput="BIC workaround" stepKey="clearFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
+        <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
+            <argument name="query" value="{{AdobeStockLicensedImage.id}}"/>
+        </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
         <actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml
@@ -57,8 +57,10 @@
         <click selector="{{AdminAdobeStockImagePreviewSection.savePreview}}" stepKey="clickSavePreviewButton"/>
         <waitForPageLoad stepKey="waitForPromptModal"/>
         <grabValueFrom selector="{{AdminAdobeStockImagePreviewSection.imageNameField}}" stepKey="grabImageFileName"/>
+        <waitForElementClickable selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmButtonClickable"/>
         <click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
         <waitForPageLoad stepKey="waitForMediaGalleryOpen"/>
+        <dontSeeElementInDOM selector="{{AdminAdobeStockImagePreviewSection.errorMessage}}" stepKey="verifyNoErrorMessage"/>
         <actionGroup ref="AdminAdobeStockMediaGallerySearchByKeywordActionGroup" stepKey="searchImage">
             <argument name="keyword" value="$grabImageName"/>
         </actionGroup>
