Skip to content

Commit 7835d21

Browse files
sivaschenkosivaschenko
authored
Merge pull request #639 from drpayyne/issue-444
MFTF Automation for: User locates licensed and uploaded image inside Media Gallery
2 parents 4be9f77 + 2e87de2 commit 7835d21

File tree

4 files changed

+74
-2
lines changed

4 files changed

+74
-2
lines changed

‎AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockImagePreviewLocateActionGroup.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminAdobeStockImagePreviewLocateActionGroup">
12+
<click selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="clickLocate"/>
13+
<waitForPageLoad stepKey="waitForMediaGalleryOpen"/>
14+
</actionGroup>
15+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<element name="savePreview" type="button" selector="//button[@class='action-secondary']//span[text()='Save Preview']"/>
1212
<element name="licenseAndSave" type="button" selector="//button[@class='action-default primary']//span[text()='License and Save']"/>
1313
<element name="save" type="block" selector="//button[@class='action-secondary']//span[text()='Save Preview']"/>
14-
<element name="locateImage" type="block" selector="//button[@class='action-secondary']//span[text()='Locate')]"/>
14+
<element name="locateImage" type="block" selector="//button[@class='action-secondary']//span[text()='Locate']"/>
1515
<element name="saveLicensedImage" type="button" selector="//div[@class='actions']/descendant::span[text()='Save']"/>
1616
<element name="image" type="block" selector="//div[@class='masonry-image-preview']//img"/>
1717
<element name="navigation" type="button" selector="//div[@class='masonry-image-preview']//div[contains(@class, 'action-buttons')]/button[@class='action-{{type}}']" parameterized="true"/>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminAdobeStockSavedLicensedImageLocateTest">
12+
<annotations>
13+
<features value="AdobeStockImagePanel"/>
14+
<stories value="User locates licensed and uploaded image inside Media Gallery"/>
15+
<title value="Adobe Stock Saved Licensed Image Locate"/>
16+
<description value="User can locate previously licensed and saved image in Media Gallery"/>
17+
<severity value="CRITICAL"/>
18+
<group value="adobe_stock_integration_license"/>
19+
<group value="adobe_stock_integration"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="AdminOpenMediaGalleryForPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
24+
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
25+
<actionGroup ref="AdminAdobeStockClickSignInActionGroup" stepKey="clickOnSignIn"/>
26+
<actionGroup ref="AdminAdobeStockImsPopupSignInFillUserDataActionGroup" stepKey="fillUserCredentials"/>
27+
<actionGroup ref="AdminAdobeStockImsPopupClickSignInActionGroup" stepKey="clickSignInImsPopup"/>
28+
<actionGroup ref="AdminAdobeStockAssertUserLoggedActionGroup" stepKey="assertUserLoggedIn"/>
29+
</before>
30+
<after>
31+
<actionGroup ref="AdminOpenMediaGalleryForPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
32+
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
33+
<actionGroup ref="AdminAdobeStockUserSignOutActionGroup" stepKey="adobeLogout"/>
34+
<actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertAdobeUserLoggedOut"/>
35+
<actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminDataGridToDefaultView"/>
36+
<actionGroup ref="logout" stepKey="adminLogout"/>
37+
</after>
38+
<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForLicensedImage">
39+
<argument name="query" value="{{AdobeStockLicensedImage.id}}"/>
40+
</actionGroup>
41+
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/>
42+
<click selector="{{AdobeStockImagePreviewSection.saveLicensedImage}}" stepKey="clickSave"/>
43+
<waitForPageLoad stepKey="waitForPromptModal"/>
44+
<grabValueFrom selector="{{AdobeStockImagePreviewSection.imageNameField}}" stepKey="grabSaveImageFileName"/>
45+
<click selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
46+
<waitForPageLoad stepKey="waitForMediaGalleryOpen"/>
47+
<seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabSaveImageFileName})}}" stepKey="imageSaved"/>
48+
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanelAgain"/>
49+
<actionGroup ref="AdminAdobeStockImagePreviewLocateActionGroup" stepKey="locateImage"/>
50+
<seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabSaveImageFileName})}}" stepKey="imageLocated"/>
51+
<actionGroup ref="AdminMediaGalleryDeleteImage" stepKey="deleteImageActionGroup">
52+
<argument name="name" value="{$grabSaveImageFileName}"/>
53+
</actionGroup>
54+
</test>
55+
</tests>

‎AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
<button class="action-secondary" type="button" data-bind="visible: !isDownloaded() && !isLicensed(), click: function(){ savePreview() }">
1919
<span translate="'Save Preview'"/>
2020
</button>
21-
<button class="action-secondary" type="button" data-bind="visible: isDownloaded(), click: function(){ locate() }">
21+
<button class="action-secondary"
22+
type="button"
23+
data-bind="visible: isDownloaded(), click: function(){ locate() }">
2224
<span translate="'Locate'"/>
2325
</button>
2426
<button class="action-default primary"

0 commit comments

Comments
 (0)