Skip to content

Commit 8f00fd3

Browse files
Merge pull request #91 from magento-cia/2.4.6-develop-2.4-develop-sync-11222022
Sync of 2.4.6-develop with 2.4-develop
2 parents 657e9c1 + e0cdbf0 commit 8f00fd3

File tree

14 files changed

+33
-29
lines changed

14 files changed

+33
-29
lines changed

AdobeStockAdminUi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-admin-ui",
33
"description": "Magento module responsible for the admin panel UI implementation",
44
"require": {
5-
"php": "~7.4.0||~8.1.0",
5+
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*",
77
"magento/module-admin-adobe-ims": "*",
88
"magento/module-adobe-ims-api": "*",

AdobeStockAsset/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-asset",
33
"description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
44
"require": {
5-
"php": "~7.4.0||~8.1.0",
5+
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*",
77
"magento/module-adobe-stock-asset-api": "*",
88
"magento/module-adobe-stock-client-api": "*",

AdobeStockAssetApi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-asset-api",
33
"description": "Magento module responsible for Adobe Stock assets handling on Magento side",
44
"require": {
5-
"php": "~7.4.0||~8.1.0",
5+
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*"
77
},
88
"type": "magento2-module",

AdobeStockClient/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-client",
33
"description": "Magento module responsible for interaction with Adobe Stock API implementation",
44
"require": {
5-
"php": "~7.4.0||~8.1.0",
5+
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*",
77
"magento/module-adobe-ims-api": "*",
88
"magento/module-adobe-stock-client-api": "*",

AdobeStockClientApi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-client-api",
33
"description": "Magento module responsible for interaction with Adobe Stock API",
44
"require": {
5-
"php": "~7.4.0||~8.1.0",
5+
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*"
77
},
88
"type": "magento2-module",

AdobeStockImage/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-image",
33
"description": "Magento module responsible for the images handling implementation",
44
"require": {
5-
"php": "~7.4.0||~8.1.0",
5+
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*",
77
"magento/module-adobe-stock-client-api": "*",
88
"magento/module-adobe-stock-asset-api": "*",

AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@
4444
<element name="deleteViewButton" type="button" selector="//div[@data-bind='afterRender: \$data.setToolbarNode']//input/following-sibling::div/button[@class='action-delete']"/>
4545
<element name="incorrectSecretModalText" type="block" selector="//*[contains(@class, 'modal-popup')]//div[contains(text(), 'Login failed')]"/>
4646
<element name="incorrectSecretModalButton" type="button" selector="//*[contains(@class, 'modal-popup')]//*[@class='modal-footer']/button//span[text()='Ok']"/>
47+
<element name="selectAnImage" type="block" selector="//div[@class='masonry-image-column' and @data-repeat-index='{{index}}']" parameterized="true"/>
4748
</section>
4849
</sections>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<description value="Admin should be able to saves image preview "/>
1818
<severity value="CRITICAL"/>
1919
<group value="adobe_stock_integration"/>
20-
<skip>
21-
<issueId value="AC-5916">Skipped</issueId>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -31,7 +28,10 @@
3128
<after>
3229
<actionGroup ref="AdminDeleteSelectedAdobeStockImagePreviewActionGroup" stepKey="removeSavedPreview"/>
3330
</after>
34-
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
31+
<conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview"/>
32+
<waitForPageLoad stepKey="waitForImagePreviewToClose"/>
33+
<click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
34+
<waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
3535
<actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
3636
<actionGroup ref="AssertAdminAdobeStockImageSavedActionGroup" stepKey="assertImageSaved"/>
3737
</test>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
media gallery storage root but they can save under the category and wysiwyg directory"/>
1717
<severity value="CRITICAL"/>
1818
<group value="adobe_stock_media_gallery"/>
19-
<skip>
20-
<issueId value="AC-5916">Skipped</issueId>
21-
</skip>
2219
</annotations>
2320

2421
<before>
@@ -38,7 +35,10 @@
3835
<actionGroup ref="AdminResetDataGridToDefaultViewActionGroup" stepKey="clearAdobeStockFilters">
3936
<argument name="index" value="2"/>
4037
</actionGroup>
41-
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
38+
<conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview"/>
39+
<waitForPageLoad stepKey="waitForImagePreviewToClose"/>
40+
<click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
41+
<waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
4242
<actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
4343
<actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview"/>
4444
<waitForText userInput="Could not save image: destination directory is restricted." stepKey="waitForErrorMessage"/>
@@ -53,7 +53,10 @@
5353
<actionGroup ref="AdminResetDataGridToDefaultViewActionGroup" stepKey="clearAdobeStockFilters2">
5454
<argument name="index" value="2"/>
5555
</actionGroup>
56-
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview2"/>
56+
<conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview2"/>
57+
<waitForPageLoad stepKey="waitForImagePreviewToClose1"/>
58+
<click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail1"/>
59+
<waitForPageLoad stepKey="waitForImagePreviewToExpand1"/>
5760
<grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.imagePreviewTitle}}" stepKey="imageTitle"/>
5861
<actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview2"/>
5962
<actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview2"/>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<description value="Admin should be able to saves image preview and see unlicensed label"/>
1818
<severity value="CRITICAL"/>
1919
<group value="adobe_stock_media_gallery"/>
20-
<skip>
21-
<issueId value="AC-5916">Skipped</issueId>
22-
</skip>
2320
</annotations>
2421

2522
<before>
@@ -53,7 +50,10 @@
5350
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5451
</after>
5552

56-
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
53+
<conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview"/>
54+
<waitForPageLoad stepKey="waitForImagePreviewToClose"/>
55+
<click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
56+
<waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
5757
<actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="openTheSaveImagePreviewPopup"/>
5858
<actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="saveImagePreview"/>
5959
<actionGroup ref="AssertAdminAdobeStockImageUnlicensedLabelActionGroup" stepKey="assertUnlicensedLabel"/>

0 commit comments

Comments
 (0)