-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'mainline/2.4-develop' into feature/wish…
…list-graphql
- Loading branch information
Showing
23 changed files
with
535 additions
and
204 deletions.
There are no files selected for viewing
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
20 changes: 20 additions & 0 deletions
20
...talogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.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,20 @@ | ||
| <?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="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup"> | ||
| <annotations> | ||
| <description>Assert asset filter placeholder value</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="filterPlaceholder" type="string"/> | ||
| </arguments> | ||
|
|
||
| <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{filterPlaceholder}}" stepKey="seeFilter"/> | ||
| </actionGroup> | ||
| </actionGroups> |
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
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
78 changes: 78 additions & 0 deletions
78
...eryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.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,78 @@ | ||
| <?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="AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest"> | ||
| <annotations> | ||
| <features value="AdminMediaGalleryUsedInProductsFilter"/> | ||
| <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/> | ||
| <title value="Used in products filter"/> | ||
| <stories value="Story 58: User sees entities where asset is used in" /> | ||
| <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951848"/> | ||
| <description value="User filters assets used in products"/> | ||
| <severity value="CRITICAL"/> | ||
| <group value="media_gallery_ui"/> | ||
| </annotations> | ||
| <before> | ||
| <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/> | ||
| <createData entity="SimpleSubCategory" stepKey="category"/> | ||
| <createData entity="SimpleProduct" stepKey="product"> | ||
| <requiredEntity createDataKey="category"/> | ||
| </createData> | ||
| <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> | ||
| </before> | ||
| <after> | ||
| <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/> | ||
| <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/> | ||
| <deleteData createDataKey="category" stepKey="deleteCategory"/> | ||
| </after> | ||
| <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProduct"> | ||
| <argument name="product" value="$$product$$"/> | ||
| </actionGroup> | ||
| <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct"> | ||
| <argument name="product" value="$$product$$"/> | ||
| </actionGroup> | ||
| <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/> | ||
| <waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" /> | ||
| <click selector="{{CatalogWYSIWYGSection.InsertImageIcon}}" stepKey="clickInsertImageIcon" /> | ||
| <waitForPageLoad stepKey="waitForPageLoad" /> | ||
| <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage"> | ||
| <argument name="image" value="ImageUpload3"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid"> | ||
| <argument name="imageName" value="{{ImageMetadata.title}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/> | ||
| <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/> | ||
| <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/> | ||
|
|
||
| <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInProducts"> | ||
| <argument name="entityName" value="Products"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied"> | ||
| <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/> | ||
| </actionGroup> | ||
|
|
||
| <deleteData createDataKey="product" stepKey="deleteProduct"/> | ||
| <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/> | ||
|
|
||
| <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/> | ||
| <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/> | ||
| <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete"> | ||
| <argument name="imageName" value="{{ImageMetadata.title}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/> | ||
|
|
||
| </test> | ||
| </tests> |
66 changes: 66 additions & 0 deletions
66
...ento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.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,66 @@ | ||
| <?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="AdminMediaGalleryAssertUsedInLinkBlocksGridTest"> | ||
| <annotations> | ||
| <features value="AdminMediaGalleryUsedInBlocksFilter"/> | ||
| <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/> | ||
| <title value="Used in blocks link"/> | ||
| <stories value="Story 58: User sees entities where asset is used in" /> | ||
| <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951848"/> | ||
| <description value="User filters assets used in blocks"/> | ||
| <severity value="CRITICAL"/> | ||
| <group value="media_gallery_ui"/> | ||
| </annotations> | ||
| <before> | ||
| <createData entity="_defaultBlock" stepKey="block" /> | ||
| <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> | ||
| </before> | ||
| <after> | ||
| <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/> | ||
| </after> | ||
|
|
||
| <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1"> | ||
| <argument name="CMSBlockPage" value="$$block$$"/> | ||
| </actionGroup> | ||
| <click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImageIcon" /> | ||
| <waitForPageLoad stepKey="waitForPageLoad" /> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage"> | ||
| <argument name="image" value="ImageUpload3"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid"> | ||
| <argument name="imageName" value="{{ImageMetadata.title}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/> | ||
| <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="saveBlock"/> | ||
|
|
||
| <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInPages"> | ||
| <argument name="entityName" value="Blocks"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied"> | ||
| <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/> | ||
| </actionGroup> | ||
|
|
||
| <deleteData createDataKey="block" stepKey="deleteBlock"/> | ||
|
|
||
| <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/> | ||
| <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/> | ||
|
|
||
| <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/> | ||
| <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete"> | ||
| <argument name="imageName" value="{{ImageMetadata.title}}"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/> | ||
| <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/> | ||
| </test> | ||
| </tests> |
Oops, something went wrong.