Merge pull request #91 from magento-cia/2.4.6-develop-2.4-develop-syn…

…c-11222022 Sync of 2.4.6-develop with 2.4-develop
magento · Nov 23, 2022 · 8f00fd3 · 8f00fd3
2 parents 657e9c1 + e0cdbf0
commit 8f00fd3
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 29 deletions.
diff --git a/AdobeStockAdminUi/composer.json b/AdobeStockAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-admin-ui",
     "description": "Magento module responsible for the admin panel UI implementation",
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~8.1.0||~8.2.0",
         "magento/framework": "*",
         "magento/module-admin-adobe-ims": "*",
         "magento/module-adobe-ims-api": "*",

diff --git a/AdobeStockAsset/composer.json b/AdobeStockAsset/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-asset",
     "description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~8.1.0||~8.2.0",
         "magento/framework": "*",
         "magento/module-adobe-stock-asset-api": "*",
         "magento/module-adobe-stock-client-api": "*",

diff --git a/AdobeStockAssetApi/composer.json b/AdobeStockAssetApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-asset-api",
     "description": "Magento module responsible for Adobe Stock assets handling on Magento side",
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~8.1.0||~8.2.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",

diff --git a/AdobeStockClient/composer.json b/AdobeStockClient/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-client",
     "description": "Magento module responsible for interaction with Adobe Stock API implementation",
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~8.1.0||~8.2.0",
         "magento/framework": "*",
         "magento/module-adobe-ims-api": "*",
         "magento/module-adobe-stock-client-api": "*",

diff --git a/AdobeStockClientApi/composer.json b/AdobeStockClientApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-client-api",
     "description": "Magento module responsible for interaction with Adobe Stock API",
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~8.1.0||~8.2.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",

diff --git a/AdobeStockImage/composer.json b/AdobeStockImage/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-image",
     "description": "Magento module responsible for the images handling implementation",
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~8.1.0||~8.2.0",
         "magento/framework": "*",
         "magento/module-adobe-stock-client-api": "*",
         "magento/module-adobe-stock-asset-api": "*",

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockSection.xml
@@ -44,5 +44,6 @@
         <element name="deleteViewButton" type="button" selector="//div[@data-bind='afterRender: \$data.setToolbarNode']//input/following-sibling::div/button[@class='action-delete']"/>
         <element name="incorrectSecretModalText" type="block" selector="//*[contains(@class, 'modal-popup')]//div[contains(text(), 'Login failed')]"/>
         <element name="incorrectSecretModalButton" type="button" selector="//*[contains(@class, 'modal-popup')]//*[@class='modal-footer']/button//span[text()='Ok']"/>
+        <element name="selectAnImage" type="block" selector="//div[@class='masonry-image-column' and @data-repeat-index='{{index}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml
@@ -17,9 +17,6 @@
             <description value="Admin should be able to saves image preview "/>
             <severity value="CRITICAL"/>
             <group value="adobe_stock_integration"/>
-            <skip>
-              <issueId value="AC-5916">Skipped</issueId>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -31,7 +28,10 @@
         <after>
             <actionGroup ref="AdminDeleteSelectedAdobeStockImagePreviewActionGroup" stepKey="removeSavedPreview"/>
         </after>
-        <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
+        <conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToClose"/>
+        <click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
         <actionGroup ref="AssertAdminAdobeStockImageSavedActionGroup" stepKey="assertImageSaved"/>
     </test>

diff --git a/...StockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml b/...StockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml
@@ -16,9 +16,6 @@
             media gallery storage root but they can save under the category and wysiwyg directory"/>
             <severity value="CRITICAL"/>
             <group value="adobe_stock_media_gallery"/>
-            <skip>
-              <issueId value="AC-5916">Skipped</issueId>
-            </skip>
         </annotations>
 
         <before>
@@ -38,7 +35,10 @@
         <actionGroup ref="AdminResetDataGridToDefaultViewActionGroup" stepKey="clearAdobeStockFilters">
             <argument name="index" value="2"/>
         </actionGroup>
-        <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
+        <conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToClose"/>
+        <click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
         <actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview"/>
         <waitForText userInput="Could not save image: destination directory is restricted." stepKey="waitForErrorMessage"/>
@@ -53,7 +53,10 @@
         <actionGroup ref="AdminResetDataGridToDefaultViewActionGroup" stepKey="clearAdobeStockFilters2">
             <argument name="index" value="2"/>
         </actionGroup>
-        <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview2"/>
+        <conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview2"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToClose1"/>
+        <click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail1"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToExpand1"/>
         <grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.imagePreviewTitle}}" stepKey="imageTitle"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview2"/>
         <actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview2"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml
@@ -17,9 +17,6 @@
             <description value="Admin should be able to saves image preview and see unlicensed label"/>
             <severity value="CRITICAL"/>
             <group value="adobe_stock_media_gallery"/>
-            <skip>
-              <issueId value="AC-5916">Skipped</issueId>
-            </skip>
         </annotations>
 
         <before>
@@ -53,7 +50,10 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
+        <conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToClose"/>
+        <click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="openTheSaveImagePreviewPopup"/>
         <actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="saveImagePreview"/>
         <actionGroup ref="AssertAdminAdobeStockImageUnlicensedLabelActionGroup" stepKey="assertUnlicensedLabel"/>

diff --git a/...StockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml b/...StockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml
@@ -17,9 +17,6 @@
             <description value="Admin should be able to save image preview and clicks add selection button"/>
             <severity value="CRITICAL"/>
             <group value="adobe_stock_media_gallery"/>
-            <skip>
-              <issueId value="AC-5916">Skipped</issueId>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -50,7 +47,10 @@
             <comment userInput="BIC workaround" stepKey="removeSavedPreview"/>
             <comment userInput="BIC workaround" stepKey="clearFilters"/>
         </after>
-        <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
+        <conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToClose"/>
+        <click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
         <actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview"/>
         <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="addSelectedSavedPreview"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSavesTheImagePreviewWithNewNameTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSavesTheImagePreviewWithNewNameTest.xml
@@ -16,9 +16,6 @@
             <description value="Admin is able to set the image name on saving the image preview"/>
             <severity value="CRITICAL"/>
             <group value="adobe_stock_integration"/>
-            <skip>
-              <issueId value="AC-5916">Skipped</issueId>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
@@ -31,7 +28,10 @@
         <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
         <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPopup"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandsFirstImageInGrid"/>
+        <conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandsFirstImageInGrid"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToClose"/>
+        <click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
+        <waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
         <actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="openTheSaveImagePreviewPopup"/>
         <actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="saveImagePreview"/>
         <actionGroup ref="AssertAdminImageIsVisibleInMediaGalleryActionGroup" stepKey="checkIfTheSavedImagesIsAvailable"/>

diff --git a/AdobeStockImageAdminUi/composer.json b/AdobeStockImageAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-image-admin-ui",
     "description": "Magento module responsible for the admin panel images UI implementation",
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~8.1.0||~8.2.0",
         "magento/framework": "*",
         "magento/module-adobe-ims": "*",
         "magento/module-adobe-ims-api": "*",

diff --git a/AdobeStockImageApi/composer.json b/AdobeStockImageApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-image-api",
     "description": "Magento module responsible for the images handling",
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~8.1.0||~8.2.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",