Version 2.1.4-p10

magento · Oct 3, 2024 · 2fe66f8 · 2fe66f8
1 parent f0f7a9d
commit 2fe66f8
Show file tree

Hide file tree

Showing 21 changed files with 102 additions and 59 deletions.
diff --git a/AdobeStockAdminUi/composer.json b/AdobeStockAdminUi/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-adobe-stock-admin-ui",
     "description": "Magento module responsible for the admin panel UI implementation",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "1.3.2",
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-admin-adobe-ims": "*",
         "magento/module-adobe-ims-api": "*",
-        "magento/module-adobe-stock-client-api": "*",
+        "magento/module-adobe-stock-client-api": "2.1.*",
         "magento/module-backend": "*",
         "magento/module-config": "*"
     },
     "suggest": {
         "magento/module-cms": "*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/AdobeStockAsset/composer.json b/AdobeStockAsset/composer.json
@@ -1,20 +1,21 @@
 {
     "name": "magento/module-adobe-stock-asset",
     "description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "1.3.1",
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
-        "magento/module-adobe-stock-asset-api": "*",
-        "magento/module-adobe-stock-client-api": "*",
+        "magento/module-adobe-stock-asset-api": "2.0.*",
+        "magento/module-adobe-stock-client-api": "2.1.*",
         "magento/module-media-gallery-api": "*",
         "magento/module-media-gallery": "*",
         "magento/module-config": "*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,3 +31,4 @@
         }
     }
 }
+
diff --git a/AdobeStockAssetApi/composer.json b/AdobeStockAssetApi/composer.json
@@ -1,15 +1,16 @@
 {
     "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",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "2.0.1",
+    "require": {
+        "php": "~7.4.0||~8.1.0",
+        "magento/framework": "*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/AdobeStockClient/composer.json b/AdobeStockClient/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-adobe-stock-client",
     "description": "Magento module responsible for interaction with Adobe Stock API implementation",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "1.3.2",
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-adobe-ims-api": "*",
-        "magento/module-adobe-stock-client-api": "*",
+        "magento/module-adobe-stock-client-api": "2.1.*",
         "astock/stock-api-libphp": "^1.1.2"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/AdobeStockClientApi/composer.json b/AdobeStockClientApi/composer.json
@@ -1,15 +1,16 @@
 {
     "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",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "2.1.2",
+    "require": {
+        "php": "~7.4.0||~8.1.0",
+        "magento/framework": "*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/AdobeStockImage/composer.json b/AdobeStockImage/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-adobe-stock-image",
     "description": "Magento module responsible for the images handling implementation",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "1.3.3",
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
-        "magento/module-adobe-stock-client-api": "*",
-        "magento/module-adobe-stock-asset-api": "*",
-        "magento/module-adobe-stock-image-api": "*",
+        "magento/module-adobe-stock-client-api": "2.1.*",
+        "magento/module-adobe-stock-asset-api": "2.0.*",
+        "magento/module-adobe-stock-image-api": "1.3.*",
         "magento/module-media-gallery-api": "*",
         "magento/module-media-gallery-synchronization-api": "*"
     },
     "suggest": {
         "magento/module-catalog": "*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml
@@ -24,4 +24,10 @@
         <data key="category">Castles</data>
         <data key="author">gam16</data>
     </entity>
+    <entity name="AdobeStockUnlicensedNewImage">
+        <data key="id">{{_CREDS.magento/adobe_stock_not_licensed_new_image}}</data>
+        <data key="status">Unlicensed</data>
+        <data key="category">Family Life</data>
+        <data key="author">Drobot Dean</data>
+    </entity>
 </entities>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml
@@ -22,6 +22,7 @@
         <element name="viewAllKeywords" type="button" selector="//*[@id='adobe-stock-images-search-modal']//span[text()='View all']"/>
         <element name="keywords" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='keyword']"/>
         <element name="firstKeyword" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='keyword'][1]"/>
+        <element name="firstKeywordNotAI" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='keyword' and not(contains(.,'nobody'))][1]"/>
         <element name="imagePreviewCategoryText" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[@data-role='image-attributes-value']//span[text()='Category']/following-sibling::div"/>
         <element name="keywordsTitle" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[text()='Similar Keywords']"/>
         <element name="keyword" type="block" selector="//div[@class='keyword']//span[text()='{{keyword}}']" parameterized="true"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml
@@ -34,7 +34,7 @@
         </actionGroup>
         <grabTextFrom selector="{{AdminAdobeStockSection.recordsFound}}" stepKey="countWithoutModelFilter"/>
         <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
-            <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
+            <argument name="query" value="{{AdobeStockUnlicensedNewImage.id}}"/>
         </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml
@@ -29,7 +29,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
-            <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
+            <argument name="query" value="{{AdobeStockUnlicensedNewImage.id}}"/>
         </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockLocalizationTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockLocalizationTest.xml
@@ -44,7 +44,7 @@
         </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <wait time="5" stepKey="waitBeforeExpandSectionLoadFull"/>
-        <grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.firstKeyword}}" stepKey="grabKeyword"/>
+        <grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.firstKeywordNotAI}}" stepKey="grabKeyword"/>
         <grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.imagePreviewCategoryText}}" stepKey="grabCategoryText"/>
         <actionGroup ref="AssertAdminAdobeStockKeywordLocalizedActionGroup" stepKey="assertKeywordLocalized">
              <argument name="stringToBeVerified" value="{$grabKeyword}"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml
@@ -17,6 +17,9 @@
             <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"/>

diff --git a/...StockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml b/...StockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml
@@ -16,6 +16,9 @@
             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>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml
@@ -17,6 +17,9 @@
             <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>

diff --git a/...StockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml b/...StockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml
@@ -17,6 +17,9 @@
             <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"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSavesTheImagePreviewWithNewNameTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSavesTheImagePreviewWithNewNameTest.xml
@@ -16,6 +16,9 @@
             <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"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml
@@ -30,7 +30,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
-            <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
+            <argument name="query" value="{{AdobeStockUnlicensedNewImage.id}}"/>
         </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandsFirstImageInGrid"/>
         <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml
@@ -16,6 +16,9 @@
             <description value="User searches for an image using search by keyword from standalone media gallery"/>
             <severity value="CRITICAL"/>
             <group value="adobe_stock_media_gallery"/>
+            <skip>
+                <issueId value="AC-5916">Skipped</issueId>
+            </skip>
         </annotations>
 
         <before>

diff --git a/AdobeStockImageAdminUi/composer.json b/AdobeStockImageAdminUi/composer.json
@@ -1,14 +1,20 @@
 {
     "name": "magento/module-adobe-stock-image-admin-ui",
     "description": "Magento module responsible for the admin panel images UI implementation",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "1.3.3-p8",
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-adobe-ims": "*",
         "magento/module-adobe-ims-api": "*",
-        "magento/module-adobe-stock-asset-api": "*",
-        "magento/module-adobe-stock-image-api": "*",
-        "magento/module-adobe-stock-client-api": "*",
+        "magento/module-adobe-stock-asset-api": "2.0.*",
+        "magento/module-adobe-stock-image-api": "1.3.*",
+        "magento/module-adobe-stock-client-api": "2.1.*",
         "magento/module-backend": "*",
         "magento/module-ui": "*",
         "magento/module-media-gallery-ui": "*",
@@ -17,11 +23,6 @@
     "suggest": {
         "magento/module-cms": "*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,3 +32,4 @@
         }
     }
 }
+
diff --git a/AdobeStockImageApi/composer.json b/AdobeStockImageApi/composer.json
@@ -1,15 +1,16 @@
 {
     "name": "magento/module-adobe-stock-image-api",
     "description": "Magento module responsible for the images handling",
-    "require": {
-        "php": "~7.4.0||~8.1.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "1.3.1",
+    "require": {
+        "php": "~7.4.0||~8.1.0",
+        "magento/framework": "*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/_metapackage/composer.json b/_metapackage/composer.json
@@ -2,14 +2,16 @@
     "name": "magento/adobe-stock-integration",
     "description": "Adobe Stock integration",
     "type": "metapackage",
+    "version": "2.1.4-p10",
     "require": {
-        "magento/module-adobe-stock-asset": "*",
-        "magento/module-adobe-stock-asset-api": "*",
-        "magento/module-adobe-stock-image": "*",
-        "magento/module-adobe-stock-image-admin-ui": "*",
-        "magento/module-adobe-stock-image-api": "*",
-        "magento/module-adobe-stock-client": "*",
-        "magento/module-adobe-stock-client-api": "*",
-        "magento/module-adobe-stock-admin-ui": "*"
+        "magento/module-adobe-stock-asset": "1.3.1",
+        "magento/module-adobe-stock-asset-api": "2.0.1",
+        "magento/module-adobe-stock-image": "1.3.3",
+        "magento/module-adobe-stock-image-admin-ui": "1.3.3-p8",
+        "magento/module-adobe-stock-image-api": "1.3.1",
+        "magento/module-adobe-stock-client": "1.3.2",
+        "magento/module-adobe-stock-client-api": "2.1.2",
+        "magento/module-adobe-stock-admin-ui": "1.3.2"
     }
 }
+