Skip to content

Commit 86423e7

Browse files
sivaschenkosivaschenko
committed
Merge branch 'ASI-1776-mftf-sorting-in-media-gallery' of github.com:joweecaquicla/magento2 into asi-delivery-24
2 parents eb00722 + aabcdcc commit 86423e7

10 files changed

+596
-0
lines changed

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickSortActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminEnhancedMediaGalleryClickSortActionGroup">
12+
<arguments>
13+
<argument name="sortName" type="string"/>
14+
</arguments>
15+
<click selector="{{AdminEnhancedMediaGallerySortBySection.sortDropdown}}" stepKey="clickOnSortDropdown"/>
16+
<click selector="{{AdminEnhancedMediaGallerySortBySection.sortOption(sortName)}}" stepKey="clickOnSortOption"/>
17+
<waitForPageLoad stepKey="waitForLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGallerySortByActionGroup.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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="AssertAdminEnhancedMediaGallerySortByActionGroup">
12+
<annotations>
13+
<description>Assert the images position in the grid after sorting has been applied.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="firstImageFile" type="string"/>
17+
<argument name="secondImageFile" type="string"/>
18+
<argument name="thirdImageFile" type="string"/>
19+
</arguments>
20+
21+
<grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('0')}}" userInput="src"
22+
stepKey="getFirstImageSrcAfterSort"/>
23+
<grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('1')}}" userInput="src"
24+
stepKey="getSecondImageSrcAfterSort"/>
25+
<grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('2')}}" userInput="src"
26+
stepKey="getThirdImageSrcAfterSort"/>
27+
28+
<assertStringContainsString stepKey="assertFirstImagePositionAfterSort">
29+
<actualResult type="string">{$getFirstImageSrcAfterSort}</actualResult>
30+
<expectedResult type="string">{{firstImageFile}}</expectedResult>
31+
</assertStringContainsString>
32+
<assertStringContainsString stepKey="assertSecondImagePositionAfterSort">
33+
<actualResult type="string">{$getSecondImageSrcAfterSort}</actualResult>
34+
<expectedResult type="string">{{secondImageFile}}</expectedResult>
35+
</assertStringContainsString>
36+
<assertStringContainsString stepKey="assertThirdImagePositionAfterSort">
37+
<actualResult type="string">{$getThirdImageSrcAfterSort}</actualResult>
38+
<expectedResult type="string">{{thirdImageFile}}</expectedResult>
39+
</assertStringContainsString>
40+
</actionGroup>
41+
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryGridImagePositionSection.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminEnhancedMediaGalleryGridImagePositionSection">
11+
<element name="nthImageInGrid" type="text" selector="div[class='masonry-image-column'][data-repeat-index='{{row}}'] img" parameterized="true"/>
12+
</section>
13+
</sections>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGallerySortBySection.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminEnhancedMediaGallerySortBySection">
11+
<element name="sortDropdown" type="button" selector="div[class='masonry-image-sortby'] select"/>
12+
<element name="sortOption" type="button" selector="//div[@class='masonry-image-sortby'] //option[@value='{{sortOption}}']" parameterized="true"/>
13+
</section>
14+
</sections>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryAscendingTest.xml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminMediaGallerySortByDirectoryAscendingTest">
11+
<annotations>
12+
<features value="MediaGallery"/>
13+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
14+
<title value="User uses Sort by Directory Ascending in Standalone Media Gallery"/>
15+
<stories value="User uses Sort by Directory Ascending in Standalone Media Gallery"/>
16+
<testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
17+
<description value="User uses Sort by Directory Ascending in Standalone Media Gallery"/>
18+
<severity value="CRITICAL"/>
19+
<group value="media_gallery_ui"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
26+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
27+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
28+
<argument name="name" value="firstFolder"/>
29+
</actionGroup>
30+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
31+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
32+
<argument name="name" value="firstFolder"/>
33+
</actionGroup>
34+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
35+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
36+
<argument name="name" value="secondFolder"/>
37+
</actionGroup>
38+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
39+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
40+
<argument name="name" value="secondFolder"/>
41+
</actionGroup>
42+
</after>
43+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
44+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
45+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
46+
<argument name="name" value="firstFolder"/>
47+
</actionGroup>
48+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
49+
<argument name="name" value="firstFolder"/>
50+
</actionGroup>
51+
52+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
53+
<argument name="image" value="ImageUpload"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
56+
<argument name="image" value="ImageUpload_1"/>
57+
</actionGroup>
58+
59+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
60+
<waitForPageLoad stepKey="waitForGridToLoad"/>
61+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
62+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
63+
<argument name="name" value="secondFolder"/>
64+
</actionGroup>
65+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
66+
<argument name="name" value="secondFolder"/>
67+
</actionGroup>
68+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
69+
<argument name="image" value="ImageUpload1"/>
70+
</actionGroup>
71+
72+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
73+
<waitForPageLoad stepKey="secondWaitForGridToLoad"/>
74+
75+
<actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByDirectoryAscending">
76+
<argument name="sortName" value="directory_asc"/>
77+
</actionGroup>
78+
79+
<actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByDirectoryAscending">
80+
<argument name="firstImageFile" value="{{ImageUpload_1.file}}"/>
81+
<argument name="secondImageFile" value="{{ImageUpload.file}}"/>
82+
<argument name="thirdImageFile" value="{{ImageUpload1.value}}"/>
83+
</actionGroup>
84+
</test>
85+
</tests>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryDescendingTest.xml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminMediaGallerySortByDirectoryDescendingTest">
11+
<annotations>
12+
<features value="MediaGallery"/>
13+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
14+
<title value="User uses Sort by Directory Descending in Standalone Media Gallery"/>
15+
<stories value="User uses Sort by Directory Descending in Standalone Media Gallery"/>
16+
<testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
17+
<description value="User uses Sort by Directory Descending in Standalone Media Gallery"/>
18+
<severity value="CRITICAL"/>
19+
<group value="media_gallery_ui"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
</before>
24+
25+
<after>
26+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
27+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
28+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
29+
<argument name="name" value="firstFolder"/>
30+
</actionGroup>
31+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
32+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
33+
<argument name="name" value="firstFolder"/>
34+
</actionGroup>
35+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
36+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
37+
<argument name="name" value="secondFolder"/>
38+
</actionGroup>
39+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
40+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
41+
<argument name="name" value="secondFolder"/>
42+
</actionGroup>
43+
</after>
44+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
45+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
46+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
47+
<argument name="name" value="firstFolder"/>
48+
</actionGroup>
49+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
50+
<argument name="name" value="firstFolder"/>
51+
</actionGroup>
52+
53+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
54+
<argument name="image" value="ImageUpload"/>
55+
</actionGroup>
56+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
57+
<argument name="image" value="ImageUpload_1"/>
58+
</actionGroup>
59+
60+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
61+
<waitForPageLoad stepKey="waitForGridToLoad"/>
62+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
63+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
64+
<argument name="name" value="secondFolder"/>
65+
</actionGroup>
66+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
67+
<argument name="name" value="secondFolder"/>
68+
</actionGroup>
69+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
70+
<argument name="image" value="ImageUpload1"/>
71+
</actionGroup>
72+
73+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
74+
<waitForPageLoad stepKey="secondWaitForGridToLoad"/>
75+
76+
<actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByDirectoryDescending">
77+
<argument name="sortName" value="directory_desc"/>
78+
</actionGroup>
79+
80+
<actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByDirectoryDescending">
81+
<argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
82+
<argument name="secondImageFile" value="{{ImageUpload.file}}"/>
83+
<argument name="thirdImageFile" value="{{ImageUpload_1.file}}"/>
84+
</actionGroup>
85+
</test>
86+
</tests>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminMediaGallerySortByNameAToZTest">
11+
<annotations>
12+
<features value="MediaGallery"/>
13+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
14+
<title value="User uses Sort by Name A to Z in Standalone Media Gallery"/>
15+
<stories value="User uses Sort by Name A to Z in Standalone Media Gallery"/>
16+
<testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
17+
<description value="User uses Sort by Name A to Z in Standalone Media Gallery"/>
18+
<severity value="CRITICAL"/>
19+
<group value="media_gallery_ui"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
26+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
27+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
28+
<argument name="name" value="firstFolder"/>
29+
</actionGroup>
30+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
31+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
32+
<argument name="name" value="firstFolder"/>
33+
</actionGroup>
34+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
35+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
36+
<argument name="name" value="secondFolder"/>
37+
</actionGroup>
38+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
39+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
40+
<argument name="name" value="secondFolder"/>
41+
</actionGroup>
42+
</after>
43+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
44+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
45+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
46+
<argument name="name" value="firstFolder"/>
47+
</actionGroup>
48+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
49+
<argument name="name" value="firstFolder"/>
50+
</actionGroup>
51+
52+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
53+
<argument name="image" value="ImageUpload"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
56+
<argument name="image" value="ImageUpload_1"/>
57+
</actionGroup>
58+
59+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
60+
<waitForPageLoad stepKey="waitForGridToLoad"/>
61+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
62+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
63+
<argument name="name" value="secondFolder"/>
64+
</actionGroup>
65+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
66+
<argument name="name" value="secondFolder"/>
67+
</actionGroup>
68+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
69+
<argument name="image" value="ImageUpload1"/>
70+
</actionGroup>
71+
72+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
73+
<waitForPageLoad stepKey="secondWaitForGridToLoad"/>
74+
75+
<actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameAToZ">
76+
<argument name="sortName" value="name_az"/>
77+
</actionGroup>
78+
79+
<actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameAToZ">
80+
<argument name="firstImageFile" value="{{ImageUpload.file}}"/>
81+
<argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
82+
<argument name="thirdImageFile" value="{{ImageUpload1.value}}"/>
83+
</actionGroup>
84+
</test>
85+
</tests>

0 commit comments

Comments
 (0)