Skip to content

Commit 88f6183

Browse files
committed
Made MFTF test stateless
1 parent 7bacf08 commit 88f6183

File tree

3 files changed

+40
-2
lines changed

3 files changed

+40
-2
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminMediaGalleryDeleteImage">
11+
<arguments>
12+
<argument name="generatedImageName" type="string"/>
13+
</arguments>
14+
<seeElement selector="{{AdobeStockSection.mediaGalleryImage({{generatedImageName}})}}" stepKey="seeImageToDelete"/>
15+
<click selector="{{AdobeStockSection.mediaGalleryImage({{generatedImageName}})}}" stepKey="clickImageToDelete"/>
16+
<waitForElementVisible selector="{{AdobeStockSection.mediaGalleryDeleteButton}}" stepKey="waitForDeleteButton"/>
17+
<click selector="{{AdobeStockSection.mediaGalleryDeleteButton}}" stepKey="clickDeleteButton"/>
18+
<waitForElementVisible selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmationModal"/>
19+
<click selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="clickConfirmButton"/>
20+
<waitForPageLoad stepKey="waitForMaskDisappeared"/>
21+
<dontSeeElement selector="{{AdobeStockSection.mediaGalleryImage({$generatedImageName})}}" stepKey="verifyImageIsDeleted"/>
22+
</actionGroup>
23+
</actionGroups>

AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<element name="countGridImages" type="text" selector="//div[@class='masonry-image-grid']/div[contains(.,data-repeat-index)]"/>
2323
<element name="recordsFound" type="text" selector="//*[@id='adobe-stock-images-search-modal']//*[text()='records found']/parent::div"/>
2424
<element name="mediaGalleryImage" type="button" selector="//img[contains(@alt,'{{imageName}}')]" parameterized="true"/>
25+
<element name="mediaGalleryDeleteButton" type="button" selector="#delete_files"/>
2526
<element name="systemAclActions" type="checkbox" selector="//a[text()='Adobe Stock']/parent::li[contains(.,'Actions')]//a"/>
2627
<element name="adobeSignIn" type="button" selector=".adobe-sign-in-button"/>
2728
<element name="adobeImsPopupUserEmail" type="button" selector="#adobeid_username"/>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,23 @@
2626
<actionGroup ref="AdminAdobeStockImsPopupSignInFillUserDataActionGroup" stepKey="fillUserCredentials"/>
2727
<actionGroup ref="AdminAdobeStockImsPopupClickSignInActionGroup" stepKey="clickSignInImsPopup"/>
2828
<actionGroup ref="AdminAdobeStockAssertUserLoggedActionGroup" stepKey="assertUserLoggedIn"/>
29+
<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForLicensedImage">
30+
<argument name="query" value="{{AdobeStockConfigDataPreviewedLicensedSavedImage.value}}"/>
31+
</actionGroup>
32+
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/>
33+
<click selector="{{AdobeStockImagePreviewSection.saveLicensedImage}}" stepKey="clickSave"/>
34+
<waitForPageLoad stepKey="waitForPromptModal"/>
35+
<grabValueFrom selector="{{AdobeStockImagePreviewSection.generatedImageName}}" stepKey="grabSaveImageFileName"/>
36+
<click selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/>
37+
<waitForPageLoad stepKey="waitForMediaGalleryOpen"/>
38+
<seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabSaveImageFileName})}}" stepKey="assertSavedImage"/>
39+
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanelAgain"/>
2940
</before>
3041
<after>
3142
<actionGroup ref="AdminOpenMediaGalleryForPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
43+
<actionGroup ref="AdminMediaGalleryDeleteImage" stepKey="deleteImageActionGroup">
44+
<argument name="generatedImageName" value="{$grabImageFileName}"/>
45+
</actionGroup>
3246
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
3347
<actionGroup ref="AdminAdobeStockUserSignOutActionGroup" stepKey="adobeLogout"/>
3448
<actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertAdobeUserLoggedOut"/>
@@ -41,7 +55,7 @@
4155
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/>
4256
<grabAttributeFrom selector="{{AdobeStockImagePreviewSection.locateImage}}" userInput="name" stepKey="grabImageFileName"/>
4357
<click selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="clickLocate"/>
44-
<waitForPageLoad stepKey="waitForMediaGalleryOpen" />
45-
<seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage" />
58+
<waitForPageLoad stepKey="waitForMediaGalleryOpen"/>
59+
<seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage"/>
4660
</test>
4761
</tests>

0 commit comments

Comments
 (0)