Skip to content

Commit fc45c83

Browse files
author
magento packaging service
committed
Version 2.1.4-p7
1 parent f0f7a9d commit fc45c83

17 files changed

+93
-56
lines changed

‎AdobeStockAdminUi/composer.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
{
22
"name": "magento/module-adobe-stock-admin-ui",
33
"description": "Magento module responsible for the admin panel UI implementation",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
9+
"version": "1.3.2",
410
"require": {
511
"php": "~7.4.0||~8.1.0",
612
"magento/framework": "*",
713
"magento/module-admin-adobe-ims": "*",
814
"magento/module-adobe-ims-api": "*",
9-
"magento/module-adobe-stock-client-api": "*",
15+
"magento/module-adobe-stock-client-api": "2.1.*",
1016
"magento/module-backend": "*",
1117
"magento/module-config": "*"
1218
},
1319
"suggest": {
1420
"magento/module-cms": "*"
1521
},
16-
"type": "magento2-module",
17-
"license": [
18-
"OSL-3.0",
19-
"AFL-3.0"
20-
],
2122
"autoload": {
2223
"files": [
2324
"registration.php"
@@ -27,3 +28,4 @@
2728
}
2829
}
2930
}
31+

‎AdobeStockAsset/composer.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
{
22
"name": "magento/module-adobe-stock-asset",
33
"description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
9+
"version": "1.3.1",
410
"require": {
511
"php": "~7.4.0||~8.1.0",
612
"magento/framework": "*",
7-
"magento/module-adobe-stock-asset-api": "*",
8-
"magento/module-adobe-stock-client-api": "*",
13+
"magento/module-adobe-stock-asset-api": "2.0.*",
14+
"magento/module-adobe-stock-client-api": "2.1.*",
915
"magento/module-media-gallery-api": "*",
1016
"magento/module-media-gallery": "*",
1117
"magento/module-config": "*"
1218
},
13-
"type": "magento2-module",
14-
"license": [
15-
"OSL-3.0",
16-
"AFL-3.0"
17-
],
1819
"autoload": {
1920
"files": [
2021
"registration.php"
@@ -30,3 +31,4 @@
3031
}
3132
}
3233
}
34+

‎AdobeStockAssetApi/composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "magento/module-adobe-stock-asset-api",
33
"description": "Magento module responsible for Adobe Stock assets handling on Magento side",
4-
"require": {
5-
"php": "~7.4.0||~8.1.0",
6-
"magento/framework": "*"
7-
},
84
"type": "magento2-module",
95
"license": [
106
"OSL-3.0",
117
"AFL-3.0"
128
],
9+
"version": "2.0.1",
10+
"require": {
11+
"php": "~7.4.0||~8.1.0",
12+
"magento/framework": "*"
13+
},
1314
"autoload": {
1415
"files": [
1516
"registration.php"
@@ -19,3 +20,4 @@
1920
}
2021
}
2122
}
23+

‎AdobeStockClient/composer.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"name": "magento/module-adobe-stock-client",
33
"description": "Magento module responsible for interaction with Adobe Stock API implementation",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
9+
"version": "1.3.2",
410
"require": {
511
"php": "~7.4.0||~8.1.0",
612
"magento/framework": "*",
713
"magento/module-adobe-ims-api": "*",
8-
"magento/module-adobe-stock-client-api": "*",
14+
"magento/module-adobe-stock-client-api": "2.1.*",
915
"astock/stock-api-libphp": "^1.1.2"
1016
},
11-
"type": "magento2-module",
12-
"license": [
13-
"OSL-3.0",
14-
"AFL-3.0"
15-
],
1617
"autoload": {
1718
"files": [
1819
"registration.php"
@@ -28,3 +29,4 @@
2829
}
2930
}
3031
}
32+

‎AdobeStockClientApi/composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "magento/module-adobe-stock-client-api",
33
"description": "Magento module responsible for interaction with Adobe Stock API",
4-
"require": {
5-
"php": "~7.4.0||~8.1.0",
6-
"magento/framework": "*"
7-
},
84
"type": "magento2-module",
95
"license": [
106
"OSL-3.0",
117
"AFL-3.0"
128
],
9+
"version": "2.1.2",
10+
"require": {
11+
"php": "~7.4.0||~8.1.0",
12+
"magento/framework": "*"
13+
},
1314
"autoload": {
1415
"files": [
1516
"registration.php"
@@ -19,3 +20,4 @@
1920
}
2021
}
2122
}
23+

‎AdobeStockImage/composer.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
{
22
"name": "magento/module-adobe-stock-image",
33
"description": "Magento module responsible for the images handling implementation",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
9+
"version": "1.3.3",
410
"require": {
511
"php": "~7.4.0||~8.1.0",
612
"magento/framework": "*",
7-
"magento/module-adobe-stock-client-api": "*",
8-
"magento/module-adobe-stock-asset-api": "*",
9-
"magento/module-adobe-stock-image-api": "*",
13+
"magento/module-adobe-stock-client-api": "2.1.*",
14+
"magento/module-adobe-stock-asset-api": "2.0.*",
15+
"magento/module-adobe-stock-image-api": "1.3.*",
1016
"magento/module-media-gallery-api": "*",
1117
"magento/module-media-gallery-synchronization-api": "*"
1218
},
1319
"suggest": {
1420
"magento/module-catalog": "*"
1521
},
16-
"type": "magento2-module",
17-
"license": [
18-
"OSL-3.0",
19-
"AFL-3.0"
20-
],
2122
"autoload": {
2223
"files": [
2324
"registration.php"
@@ -27,3 +28,4 @@
2728
}
2829
}
2930
}
31+

‎AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<element name="viewAllKeywords" type="button" selector="//*[@id='adobe-stock-images-search-modal']//span[text()='View all']"/>
2323
<element name="keywords" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='keyword']"/>
2424
<element name="firstKeyword" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='keyword'][1]"/>
25+
<element name="firstKeywordNotAI" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='keyword' and not(contains(.,'nobody'))][1]"/>
2526
<element name="imagePreviewCategoryText" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[@data-role='image-attributes-value']//span[text()='Category']/following-sibling::div"/>
2627
<element name="keywordsTitle" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[text()='Similar Keywords']"/>
2728
<element name="keyword" type="block" selector="//div[@class='keyword']//span[text()='{{keyword}}']" parameterized="true"/>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockLocalizationTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</actionGroup>
4545
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
4646
<wait time="5" stepKey="waitBeforeExpandSectionLoadFull"/>
47-
<grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.firstKeyword}}" stepKey="grabKeyword"/>
47+
<grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.firstKeywordNotAI}}" stepKey="grabKeyword"/>
4848
<grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.imagePreviewCategoryText}}" stepKey="grabCategoryText"/>
4949
<actionGroup ref="AssertAdminAdobeStockKeywordLocalizedActionGroup" stepKey="assertKeywordLocalized">
5050
<argument name="stringToBeVerified" value="{$grabKeyword}"/>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
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>
2023
</annotations>
2124
<before>
2225
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
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>
1922
</annotations>
2023

2124
<before>

0 commit comments

Comments
 (0)