Skip to content

Commit c1410e7

Browse files
author
joweecaquicla
committed
magento/adobe-stock-integration#1795: [MFTF] Unskip AdminMediaGalleryCatalogUiUsedInProductFilterTest - modified sorting mftf tests
1 parent a298f3b commit c1410e7

6 files changed

+78
-203
lines changed

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

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,58 +24,37 @@
2424
<after>
2525
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
2626
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
27-
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
28-
<argument name="name" value="firstFolder"/>
27+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
28+
<argument name="name" value="parentFolder"/>
2929
</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"/>
30+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
31+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
32+
<argument name="name" value="parentFolder"/>
4133
</actionGroup>
4234
</after>
4335
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
44-
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
45-
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
46-
<argument name="name" value="firstFolder"/>
36+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
37+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
38+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
39+
<argument name="name" value="parentFolder"/>
4740
</actionGroup>
48-
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
49-
<argument name="name" value="firstFolder"/>
41+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
42+
<argument name="name" value="parentFolder"/>
5043
</actionGroup>
51-
44+
<waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
5245
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
5346
<argument name="image" value="ImageUpload"/>
5447
</actionGroup>
5548
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
5649
<argument name="image" value="ImageUpload_1"/>
5750
</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>
6851
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
6952
<argument name="image" value="ImageUpload1"/>
7053
</actionGroup>
71-
72-
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
73-
<waitForPageLoad stepKey="secondWaitForGridToLoad"/>
74-
54+
<waitForPageLoad stepKey="waitForGridToLoad"/>
7555
<actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByDirectoryAscending">
7656
<argument name="sortName" value="directory_asc"/>
7757
</actionGroup>
78-
7958
<actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByDirectoryAscending">
8059
<argument name="firstImageFile" value="{{ImageUpload_1.file}}"/>
8160
<argument name="secondImageFile" value="{{ImageUpload.file}}"/>

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

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,62 +21,40 @@
2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2323
</before>
24-
2524
<after>
2625
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
2726
<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"/>
27+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
28+
<argument name="name" value="parentFolder"/>
3429
</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"/>
30+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
31+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
32+
<argument name="name" value="parentFolder"/>
4233
</actionGroup>
4334
</after>
4435
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
45-
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
46-
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
47-
<argument name="name" value="firstFolder"/>
36+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
37+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
38+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
39+
<argument name="name" value="parentFolder"/>
4840
</actionGroup>
49-
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
50-
<argument name="name" value="firstFolder"/>
41+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
42+
<argument name="name" value="parentFolder"/>
5143
</actionGroup>
52-
44+
<waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
5345
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
5446
<argument name="image" value="ImageUpload"/>
5547
</actionGroup>
5648
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
5749
<argument name="image" value="ImageUpload_1"/>
5850
</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>
6951
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
7052
<argument name="image" value="ImageUpload1"/>
7153
</actionGroup>
72-
73-
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
74-
<waitForPageLoad stepKey="secondWaitForGridToLoad"/>
75-
54+
<waitForPageLoad stepKey="waitForGridToLoad"/>
7655
<actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByDirectoryDescending">
7756
<argument name="sortName" value="directory_desc"/>
7857
</actionGroup>
79-
8058
<actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByDirectoryDescending">
8159
<argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
8260
<argument name="secondImageFile" value="{{ImageUpload.file}}"/>

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

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,58 +24,37 @@
2424
<after>
2525
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
2626
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
27-
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
28-
<argument name="name" value="firstFolder"/>
27+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
28+
<argument name="name" value="parentFolder"/>
2929
</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"/>
30+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
31+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
32+
<argument name="name" value="parentFolder"/>
4133
</actionGroup>
4234
</after>
4335
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
44-
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
45-
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
46-
<argument name="name" value="firstFolder"/>
36+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
37+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
38+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
39+
<argument name="name" value="parentFolder"/>
4740
</actionGroup>
48-
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
49-
<argument name="name" value="firstFolder"/>
41+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
42+
<argument name="name" value="parentFolder"/>
5043
</actionGroup>
51-
44+
<waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
5245
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
5346
<argument name="image" value="ImageUpload"/>
5447
</actionGroup>
5548
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
5649
<argument name="image" value="ImageUpload_1"/>
5750
</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>
6851
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
6952
<argument name="image" value="ImageUpload1"/>
7053
</actionGroup>
71-
72-
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
73-
<waitForPageLoad stepKey="secondWaitForGridToLoad"/>
74-
54+
<waitForPageLoad stepKey="waitForGridToLoad"/>
7555
<actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameAToZ">
7656
<argument name="sortName" value="name_az"/>
7757
</actionGroup>
78-
7958
<actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameAToZ">
8059
<argument name="firstImageFile" value="{{ImageUpload.file}}"/>
8160
<argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>

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

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,58 +24,37 @@
2424
<after>
2525
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
2626
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
27-
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
28-
<argument name="name" value="firstFolder"/>
27+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
28+
<argument name="name" value="parentFolder"/>
2929
</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"/>
30+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
31+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
32+
<argument name="name" value="parentFolder"/>
4133
</actionGroup>
4234
</after>
4335
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
44-
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
45-
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
46-
<argument name="name" value="firstFolder"/>
36+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
37+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
38+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
39+
<argument name="name" value="parentFolder"/>
4740
</actionGroup>
48-
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
49-
<argument name="name" value="firstFolder"/>
41+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
42+
<argument name="name" value="parentFolder"/>
5043
</actionGroup>
51-
44+
<waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
5245
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
5346
<argument name="image" value="ImageUpload"/>
5447
</actionGroup>
5548
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
5649
<argument name="image" value="ImageUpload_1"/>
5750
</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>
6851
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
6952
<argument name="image" value="ImageUpload1"/>
7053
</actionGroup>
71-
72-
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
73-
<waitForPageLoad stepKey="secondWaitForGridToLoad"/>
74-
54+
<waitForPageLoad stepKey="waitForGridToLoad"/>
7555
<actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameZToA">
7656
<argument name="sortName" value="name_za"/>
7757
</actionGroup>
78-
7958
<actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameZToA">
8059
<argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
8160
<argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>

0 commit comments

Comments
 (0)