-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36 from engcom-Foxtrot/MC-39756
MC-39756: An image added to the Content via Page Builder is not counted in "Used In" counter.
- Loading branch information
Showing
3 changed files
with
128 additions
and
0 deletions.
There are no files selected for viewing
19 changes: 19 additions & 0 deletions
19
...tf/ActionGroup/ContentTypeImageActionGroup/AdminOpenSelectImageFromGalleryActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminOpenSelectImageFromGalleryActionGroup"> | ||
| <annotations> | ||
| <description>Open selected Image from Gallery.</description> | ||
| </annotations> | ||
|
|
||
| <waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.selectFromGalleryBtn}}" stepKey="seeSelectFromGalleryBtn"/> | ||
| <click selector="{{ImageOnStageWithoutImageUploaded.selectFromGalleryBtn}}" stepKey="clickSelectFromGalleryBtn"/> | ||
| <waitForElementVisible selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}" stepKey="waitForAnimation"/> | ||
| </actionGroup> | ||
| </actionGroups> |
24 changes: 24 additions & 0 deletions
24
app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderNewMediaGalleryRenditionsSuite.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd"> | ||
| <suite name="PageBuilderNewMediaGalleryRenditionsSuite"> | ||
| <before> | ||
| <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="disableWYSIWYG" /> | ||
| <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="enableEnhancedMediaGallery"/> | ||
| <magentoCLI command="config:set {{MediaGalleryRenditionsDataEnabled.path}} {{MediaGalleryRenditionsDataEnabled.value}}" stepKey="enableMediaGalleryRenditions"/> | ||
| </before> | ||
| <after> | ||
| <magentoCLI command="config:set {{MediaGalleryRenditionsDataDisabled.path}} {{MediaGalleryRenditionsDataDisabled.value}}" stepKey="disableMediaGalleryRenditions"/> | ||
| <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="disableEnhancedMediaGallery"/> | ||
| <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG" /> | ||
| </after> | ||
| <include> | ||
| <group name="page_builder_new_media_gallery_renditions"/> | ||
| </include> | ||
| </suite> | ||
| </suites> |
85 changes: 85 additions & 0 deletions
85
...st/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithImageTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
| <test name="PageBuilderCMSPageCreatePageWithImageTest"> | ||
| <annotations> | ||
| <features value="PageBuilder"/> | ||
| <stories value="CMS Page"/> | ||
| <title value="Create CMS Page with Image"/> | ||
| <description value="Create CMS Page with Image and verify Page is counted in Image 'used in' section"/> | ||
| <severity value="MAJOR"/> | ||
| <group value="page_builder_new_media_gallery_renditions"/> | ||
| </annotations> | ||
| <before> | ||
| <createData entity="_defaultCmsPage" stepKey="createCMSPage"/> | ||
| <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> | ||
| <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGalleryBefore"/> | ||
| <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridBefore"/> | ||
| <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/> | ||
| <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"> | ||
| <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage"> | ||
| <argument name="image" value="ImageUpload3"/> | ||
| </actionGroup> | ||
| </before> | ||
| <after> | ||
| <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryAfter"/> | ||
| <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAfter"/> | ||
| <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAfter"> | ||
| <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/> | ||
| <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/> | ||
| <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> | ||
| <deleteData createDataKey="createCMSPage" stepKey="deleteCmsPage"/> | ||
| </after> | ||
|
|
||
| <!-- Open CMS Page on admin--> | ||
| <actionGroup ref="AdminOpenCmsPageActionGroup" stepKey="openEditPage"> | ||
| <argument name="page_id" value="$$createCMSPage.id$$"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Add the Image to CMS Page --> | ||
| <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/> | ||
| <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer"> | ||
| <argument name="contentType" value="PageBuilderRowContentType"/> | ||
| <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/> | ||
| </actionGroup> | ||
| <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection"> | ||
| <argument name="contentType" value="PageBuilderImageContentType"/> | ||
| </actionGroup> | ||
| <actionGroup ref="dragContentTypeToStage" stepKey="dragImageIntoStage"> | ||
| <argument name="contentType" value="PageBuilderImageContentType"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminOpenSelectImageFromGalleryActionGroup" stepKey="openMediaGallery"/> | ||
| <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGrid"/> | ||
| <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolder"> | ||
| <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectFirstImage"> | ||
| <argument name="imageName" value="{{ImageMetadata.title}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedCategoryImage"/> | ||
| <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/> | ||
|
|
||
| <!-- Save CMS Page --> | ||
| <actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="saveCmsPageAndContinue"/> | ||
|
|
||
| <!-- Check if Image have "used in" data section --> | ||
| <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/> | ||
| <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/> | ||
| <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolderToCheck"> | ||
| <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/> | ||
| <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup" | ||
| stepKey="assertUsedInSectionDisplayed"/> | ||
| </test> | ||
| </tests> |