Skip to content

Commit 4933bb9

Browse files
tomreecetomreece
committed
Merge branch '2.3-develop' into RE-develop-pr
2 parents fea2d9d + e47b0d7 commit 4933bb9

File tree

7 files changed

+41
-19
lines changed

7 files changed

+41
-19
lines changed

‎dev/tests/acceptance/tests/_data/LargerThan2MB.jpg

2.57 MB
Loading

‎dev/tests/acceptance/tests/_data/test-IMAGE_123,456.789.jpg

54 KB
Loading

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,18 @@
8989
<see selector="{{AdminCategoryContentSection.imageFileName}}" userInput="{{image.file}}" stepKey="seeImage"/>
9090
</actionGroup>
9191

92+
<!-- Action to navigate to Media Gallery. Used in tests to cleanup uploaded images -->
93+
<actionGroup name="navigateToMediaGallery">
94+
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnAdminCategoryPage"/>
95+
<waitForElementVisible selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="waitForContentSection"/>
96+
<conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
97+
<waitForPageLoad stepKey="waitForPageLoad1"/>
98+
<waitForElementVisible selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="waitForSelectFromGalleryButton"/>
99+
<click selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="clickSelectFromGalleryButton"/>
100+
<waitForPageLoad stepKey="waitForPageLoad2"/>
101+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
102+
</actionGroup>
103+
92104
<!--Actions to check if a category exists on StoreFront-->
93105
<actionGroup name="CheckCategoryOnStorefront">
94106
<arguments>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/DeleteImageFromStorageActionGroup.xml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,22 @@
99
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="DeleteImageFromStorageActionGroup">
1111
<arguments>
12-
<argument name="Image" defaultValue="" />
12+
<argument name="Image"/>
1313
</arguments>
14-
<click selector="//small[contains(text(),'{{Image.value}}')]" stepKey="selectImage" />
15-
<see selector="{{MediaGallerySection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn"/>
16-
<click selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected" />
17-
<waitForText userInput="OK" stepKey="waitForConfirm" />
18-
<click selector="{{MediaGallerySection.confirmDelete}}" stepKey="confirmDelete" />
19-
<waitForElementNotVisible selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="waitForImageDeleted" />
20-
<dontSeeElement selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="dontSeeImage" />
14+
<waitForElementVisible selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForInitialImages"/>
15+
<grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="initialImages"/>
16+
<click selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="selectImage"/>
17+
<waitForElementVisible selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="waitForDeleteBtn"/>
18+
<click selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected"/>
19+
<waitForPageLoad stepKey="waitForPageLoad1"/>
20+
<waitForElementVisible selector="{{MediaGallerySection.confirmDelete}}" stepKey="waitForConfirmBtn"/>
21+
<click selector="{{MediaGallerySection.confirmDelete}}" stepKey="clickConfirmBtn"/>
22+
<waitForPageLoad stepKey="waitForPageLoad2"/>
23+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
24+
<grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="newImages"/>
25+
<assertLessThan stepKey="assertLessImages">
26+
<expectedResult type="variable">initialImages</expectedResult>
27+
<actualResult type="variable">newImages</actualResult>
28+
</assertLessThan>
2129
</actionGroup>
2230
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/NavigateToMediaFolderActionGroup.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="NavigateToMediaFolderActionGroup">
1111
<arguments>
12-
<argument name="FolderName" type="string" defaultValue="" />
12+
<argument name="FolderName" type="string"/>
1313
</arguments>
1414
<conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickArrowIfClosed" visible="true"/>
15-
<waitForText userInput="{{FolderName}}" stepKey="waitForNewFolder" />
16-
<click userInput="{{FolderName}}" stepKey="clickOnCreatedFolder" />
17-
<waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
15+
<waitForText userInput="{{FolderName}}" stepKey="waitForNewFolder"/>
16+
<click userInput="{{FolderName}}" stepKey="clickOnCreatedFolder"/>
17+
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
1818
</actionGroup>
1919
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SelectImageFromMediaStorageActionGroup.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
</actionGroup>
3838
<actionGroup name="attachImage">
3939
<arguments>
40-
<argument name="Image" defaultValue=""/>
40+
<argument name="Image"/>
4141
</arguments>
42-
<attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{Image.value}}" stepKey="uploadImage1"/>
43-
<waitForLoadingMaskToDisappear stepKey="waitForLoading6" />
44-
<waitForElementVisible selector="{{MediaGallerySection.image(Image.value)}}" stepKey="waitForUploadImage1" />
45-
<seeElement selector="{{MediaGallerySection.imageSelected(Image.value)}}" stepKey="seeImageSelected" />
42+
<attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{Image.value}}" stepKey="uploadImage"/>
43+
<waitForPageLoad stepKey="waitForPageLoad"/>
44+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
45+
<waitForElementVisible selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForUploadImage"/>
4646
</actionGroup>
4747
<actionGroup name="deleteImage">
4848
<see selector="{{MediaGallerySection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn"/>
@@ -53,8 +53,9 @@
5353
<dontSeeElement selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="dontSeeImage" />
5454
</actionGroup>
5555
<actionGroup name="saveImage">
56-
<click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickInsertBtn" />
57-
<waitForPageLoad stepKey="waitForPageLoad2"/>
56+
<click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickInsertBtn"/>
57+
<waitForPageLoad stepKey="waitForPageLoad"/>
58+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
5859
</actionGroup>
5960
<actionGroup name="fillOutUploadImagePopup">
6061
<waitForElementVisible selector="{{MediaGallerySection.OkBtn}}" stepKey="waitForOkBtn" />

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/TinyMCESection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<element name="Browse" type="button" selector=".mce-i-browse"/>
3737
<element name="BrowseUploadImage" type="file" selector=".fileupload" />
3838
<element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
39+
<element name="imageOrImageCopy" type="text" selector="//img[contains(@alt, '{{arg1}}.{{arg2}}')]|//img[contains(@alt,'{{arg1}}_') and contains(@alt,'.{{arg2}}')]" parameterized="true"/>
3940
<element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
4041
<element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
4142
<element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />

0 commit comments

Comments
 (0)