Merge branch 'develop' of https://github.com/mage-os/mirror-adobe-sto…

…ck-integration into develop

AdobeStockAdminUi/Test/Mftf/Test/AdminAdobeStockConfigTest.xml

@@ -18,6 +18,7 @@
             <description value="Admin should be able to configure Adobe Stock Integration"/>
             <severity value="CRITICAL"/>
             <group value="adobe_stock_integration_configuration"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>

AdobeStockImage/Test/Mftf/Test/StorefrontAdobeStockIntegrationApiSwaggerActionsExistTest.xml

@@ -16,6 +16,9 @@
             <description value="Adobe stock actions are available on the Swagger page"/>
             <severity value="CRITICAL"/>
             <group value="developer_mode_only"/>
+            <skip>
+                <issueId value="ACQE-4803">To be converted to WebApi test</issueId>
+            </skip>
         </annotations>
         <before>
             <getOTP stepKey="getOtpCode"/>

AdobeStockImageAdminUi/Test/Mftf/README.md

@@ -29,10 +29,12 @@ against:
 
 i.e.:
 
-    MAGENTO_BASE_URL=https://magento2.local/
-    MAGENTO_BACKEND_NAME=admin_hgkq1l
-    MAGENTO_ADMIN_USERNAME=admin
-    MAGENTO_ADMIN_PASSWORD=admin123
+```env
+MAGENTO_BASE_URL=https://magento2.local/
+MAGENTO_BACKEND_NAME=admin_hgkq1l
+MAGENTO_ADMIN_USERNAME=admin
+MAGENTO_ADMIN_PASSWORD=admin123
+```
 
 More details about the configuration options available via `.env` can be found
 on the [MFTF Configuration
@@ -51,10 +53,12 @@ Stock accounts and keys and thus MFTF treats them differently:
 
 i.e.:
 
-    magento/adobe_stock_api_key=12345
-    magento/adobe_stock_private_key=67890
-    magento/adobe_stock_user_email=shantanu@adobe.com
-    magento/adobe_stock_user_password=password
+```env
+magento/adobe_stock_api_key=12345
+magento/adobe_stock_private_key=67890
+magento/adobe_stock_user_email=shantanu@adobe.com
+magento/adobe_stock_user_password=password
+```
 
 More details about storing credentials in MFTF via `.credentials` can be found
 on the [MFTF Credentials documentation](https://developer.adobe.com/commerce/testing/functional-testing-framework/credentials/).

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(.,'ai'))][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"/>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockEnablesDisablesEnhancedMediaGalleryTest.xml

@@ -35,6 +35,9 @@
             <!-- Enable Adobe Stock Integration -->
             <magentoCLI command="config:set {{AdobeStockIntegrationEnable.path}} {{AdobeStockIntegrationEnable.value}}" stepKey="enableAdobeStockIntegration"/>
 
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config block_html"/>
+            </actionGroup>
             <!-- Logout From Admin -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>

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}"/>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminViewsStockLicenseStatusTest.xml

@@ -31,7 +31,7 @@
             <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
         </before>
         <after>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableEnhancedMediaGallery"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableEnhancedMediaGallery"/>
             <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPageForSeeStatusImage"/>
             <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPageForSeeStatusImage"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
@@ -52,7 +52,7 @@
         <click selector="{{AdminAdobeStockImagePreviewSection.savePreview}}" stepKey="clickOnSavePreview"/>
         <actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="savePreviewImage"/>
 
-        <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableEnhancedMediaGallery">
+        <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableEnhancedMediaGallery">
             <argument name="enabled" value="1"/>
         </actionGroup>
         <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPageForSeeStatusImage"/>

README.md

@@ -9,13 +9,13 @@ Adobe Stock Integration provides a searchable interface in the Magento Admin to
 ## Documentation
 
 - Complete documentation located on the project [wiki pages](https://github.com/magento/adobe-stock-integration/wiki):
-  - Project [roadmap](https://github.com/magento/adobe-stock-integration/wiki/Adobe-Stock-Image-Integration-Roadmap) contains information about project phases and stories for each phase 
+  - Project [roadmap](https://github.com/magento/adobe-stock-integration/wiki/Adobe-Stock-Image-Integration-Roadmap) contains information about project phases and stories for each phase
   - How to start local development described in the [installation guide](https://github.com/magento/adobe-stock-integration/wiki/Installation)
   - How to [run the project tests](https://github.com/magento/adobe-stock-integration/wiki/Run-the-Tests)
 
 ## Community Engineering Slack
 
-To connect with Magento team and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). 
+To connect with Magento team and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com).
 If you are interested in joining Slack, or a specific channel, use our [self signup](https://opensource.magento.com/slack) link.
 
 Adobe Stock Integration project slack channel: [#adobe-stock](https://magentocommeng.slack.com/messages/CJLSYEPFA)

_metapackage/README.md

@@ -1,2 +1 @@
 # Magento_AdobeStock
-