Skip to content

Commit 8a65e78

Browse files
dvoskoboinikovdvoskoboinikov
authored
Merge pull request #69 from magento-cia/pre-release-develop-sync-122021
Sync of 2.4.4-develop with 2.4-develop
2 parents 3bdeb45 + bf122b9 commit 8a65e78

File tree

11 files changed

+59
-26
lines changed

11 files changed

+59
-26
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.0.0",
5+
"php": "~7.4.0||~8.0.0||~8.1.0",
66
"magento/framework": "*",
77
"magento/module-adobe-ims-api": "*",
88
"magento/module-adobe-stock-client-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.0.0",
5+
"php": "~7.4.0||~8.0.0||~8.1.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.0.0",
5+
"php": "~7.4.0||~8.0.0||~8.1.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.0.0",
5+
"php": "~7.4.0||~8.0.0||~8.1.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.0.0",
5+
"php": "~7.4.0||~8.0.0||~8.1.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.0.0",
5+
"php": "~7.4.0||~8.0.0||~8.1.0",
66
"magento/framework": "*",
77
"magento/module-adobe-stock-client-api": "*",
88
"magento/module-adobe-stock-asset-api": "*",

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewLocateTest.xml‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,29 @@
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2323
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
2424
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
25+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
26+
<argument name="FolderName" value="Storage Root"/>
27+
</actionGroup>
28+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
29+
<argument name="FolderName" value="wysiwyg"/>
30+
</actionGroup>
31+
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
32+
<argument name="ImageFolder" value="ImageFolder"/>
33+
</actionGroup>
2534
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
2635
</before>
2736
<after>
2837
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
2938
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
39+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
40+
<argument name="FolderName" value="Storage Root"/>
41+
</actionGroup>
42+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
43+
<argument name="FolderName" value="wysiwyg"/>
44+
</actionGroup>
45+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
46+
<argument name="ImageFolder" value="ImageFolder"/>
47+
</actionGroup>
3048
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
3149
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
3250
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
@@ -35,17 +53,15 @@
3553
<argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
3654
</actionGroup>
3755
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandUnlicensedImage"/>
38-
<click selector="{{AdminAdobeStockImagePreviewSection.savePreview}}" stepKey="clickSavePreviewButton"/>
39-
<waitForPageLoad stepKey="waitForPromptModal"/>
56+
<actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="clickSavePreviewButton"/>
57+
<comment userInput="BIC workaround" stepKey="waitForPromptModal"/>
4058
<grabValueFrom selector="{{AdminAdobeStockImagePreviewSection.imageNameField}}" stepKey="grabImageFileName"/>
4159
<click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
4260
<waitForPageLoad stepKey="waitForMediaGalleryOpen"/>
43-
<seeElement selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage"/>
61+
<waitForElementVisible selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage"/>
4462
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanelAgain"/>
4563
<actionGroup ref="AdminAdobeStockImagePreviewLocateActionGroup" stepKey="locateImage"/>
46-
<seeElement selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="imageLocated"/>
47-
<actionGroup ref="AdminMediaGalleryDeleteImage" stepKey="deleteImageActionGroup">
48-
<argument name="name" value="{$grabImageFileName}"/>
49-
</actionGroup>
64+
<waitForElementVisible selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="imageLocated"/>
65+
<comment userInput="BIC workaround" stepKey="deleteImageActionGroup"/>
5066
</test>
5167
</tests>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockListingStateTest.xml‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,29 @@
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
2525
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
26+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
27+
<argument name="FolderName" value="Storage Root"/>
28+
</actionGroup>
29+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
30+
<argument name="FolderName" value="wysiwyg"/>
31+
</actionGroup>
32+
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
33+
<argument name="ImageFolder" value="ImageFolder"/>
34+
</actionGroup>
2635
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
2736
</before>
2837
<after>
38+
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
39+
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
40+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
41+
<argument name="FolderName" value="Storage Root"/>
42+
</actionGroup>
43+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
44+
<argument name="FolderName" value="wysiwyg"/>
45+
</actionGroup>
46+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
47+
<argument name="ImageFolder" value="ImageFolder"/>
48+
</actionGroup>
2949
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
3050
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
3151
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -38,24 +58,21 @@
3858
</actionGroup>
3959
<actionGroup ref="AdminAdobeStockOpenNextPageActionGroup" stepKey="openNextPage"/>
4060
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
41-
42-
<click selector="{{AdminAdobeStockImagePreviewSection.savePreview}}" stepKey="clickSavePreview"/>
43-
<waitForPageLoad stepKey="waitForPromptModal" />
44-
<grabValueFrom selector="{{AdminAdobeStockImagePreviewSection.imageNameField}}" stepKey="grabImageFileName" />
61+
<actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="clickSavePreview"/>
62+
<comment userInput="BIC workaround" stepKey="waitForPromptModal"/>
63+
<grabValueFrom selector="{{AdminAdobeStockImagePreviewSection.imageNameField}}" stepKey="grabImageFileName"/>
4564
<click selector="{{AdminAdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
4665
<waitForPageLoad stepKey="waitForMediaGalleryOpen" />
47-
<seeElement selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage" />
66+
<waitForElementVisible selector="{{AdminAdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage"/>
4867
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
4968
<actionGroup ref="AssertAdminAdobeStockCurrentPageNumberActionGroup" stepKey="seeSecondPage">
5069
<argument name="pageNumber" value="2"/>
5170
</actionGroup>
5271
<actionGroup ref="AssertAdminAdobeStockFilterResultsActionGroup" stepKey="verifyAppliedFilter">
5372
<argument name="resultValue" value="Horizontal"/>
5473
</actionGroup>
55-
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
56-
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
57-
<actionGroup ref="AdminMediaGalleryDeleteImage" stepKey="deleteImageActionGroup">
58-
<argument name="name" value="{$grabImageFileName}"/>
59-
</actionGroup>
74+
<comment userInput="BIC workaround" stepKey="openNewPage"/>
75+
<comment userInput="BIC workaround" stepKey="openMediaGalleryForPage"/>
76+
<comment userInput="BIC workaround" stepKey="deleteImageActionGroup"/>
6077
</test>
6178
</tests>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<features value="MediaGallery"/>
1212
<stories value="User searches for an image using search by keyword from standalone media gallery"/>
1313
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1121"/>
14-
<testCaseId value=" https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/4503803"/>
14+
<testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/4503803"/>
1515
<title value="User searches for an image using search by keyword from standalone media gallery"/>
1616
<description value="User searches for an image using search by keyword from standalone media gallery"/>
1717
<severity value="CRITICAL"/>

‎AdobeStockImageAdminUi/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-admin-ui",
33
"description": "Magento module responsible for the admin panel images UI implementation",
44
"require": {
5-
"php": "~7.4.0||~8.0.0",
5+
"php": "~7.4.0||~8.0.0||~8.1.0",
66
"magento/framework": "*",
77
"magento/module-adobe-ims": "*",
88
"magento/module-adobe-ims-api": "*",

0 commit comments

Comments
 (0)