Skip to content

Commit 7ff8178

Browse files
faizan-shkfaizan-shk
authored
Merge branch 'magento-commerce:develop' into Hammer_PlatForm_Health_246_Scope_14102022
2 parents 28c9cf6 + 704e069 commit 7ff8178

6 files changed

+25
-21
lines changed

‎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"/>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.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 save image preview and clicks add selection button"/>
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
<before>
2522
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -50,7 +47,10 @@
5047
<comment userInput="BIC workaround" stepKey="removeSavedPreview"/>
5148
<comment userInput="BIC workaround" stepKey="clearFilters"/>
5249
</after>
53-
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
50+
<conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandImagePreview"/>
51+
<waitForPageLoad stepKey="waitForImagePreviewToClose"/>
52+
<click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
53+
<waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
5454
<actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
5555
<actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview"/>
5656
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="addSelectedSavedPreview"/>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminSavesTheImagePreviewWithNewNameTest.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<description value="Admin is able to set the image name on saving the image preview"/>
1717
<severity value="CRITICAL"/>
1818
<group value="adobe_stock_integration"/>
19-
<skip>
20-
<issueId value="AC-5916">Skipped</issueId>
21-
</skip>
2219
</annotations>
2320
<before>
2421
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
@@ -31,7 +28,10 @@
3128
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
3229
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPopup"/>
3330
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
34-
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandsFirstImageInGrid"/>
31+
<conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="expandsFirstImageInGrid"/>
32+
<waitForPageLoad stepKey="waitForImagePreviewToClose"/>
33+
<click selector="{{AdminAdobeStockSection.selectAnImage('2')}}" stepKey="clickOnThumbnail"/>
34+
<waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
3535
<actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="openTheSaveImagePreviewPopup"/>
3636
<actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="saveImagePreview"/>
3737
<actionGroup ref="AssertAdminImageIsVisibleInMediaGalleryActionGroup" stepKey="checkIfTheSavedImagesIsAvailable"/>

0 commit comments

Comments
 (0)