Skip to content

Commit 1bba64d

Browse files
rimple-sainirimple-saini
committed
Merge remote-tracking branch 'origin/AC-3034' into ArrowsBugFixDelivery_23112022
2 parents 89beb05 + a068da2 commit 1bba64d

11 files changed

+120
-58
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminAddImageToWYSIWYGCatalogTest">
11-
<before>
12-
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
13-
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
14-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
15-
</before>
1611
<annotations>
1712
<features value="Catalog"/>
1813
<stories value="MAGETWO-42041-Default WYSIWYG toolbar configuration with Magento Media Gallery"/>
@@ -22,6 +17,34 @@
2217
<severity value="CRITICAL"/>
2318
<testCaseId value="MAGETWO-84373"/>
2419
</annotations>
20+
<before>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
22+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
23+
<argument name="enabled" value="0"/>
24+
</actionGroup>
25+
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
26+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
27+
</before>
28+
<after>
29+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
30+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
31+
<argument name="FolderName" value="Storage Root"/>
32+
</actionGroup>
33+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
34+
<argument name="FolderName" value="wysiwyg"/>
35+
</actionGroup>
36+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
37+
<argument name="ImageFolder" value="ImageFolder"/>
38+
</actionGroup>
39+
<actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
40+
<argument name="categoryEntity" value="SimpleSubCategory"/>
41+
</actionGroup>
42+
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
43+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<argument name="enabled" value="1"/>
45+
</actionGroup>
46+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
47+
</after>
2548
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToNewCatalog"/>
2649
<comment userInput="BIC workaround" stepKey="wait2"/>
2750
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
@@ -57,22 +80,5 @@
5780
<waitForPageLoad stepKey="waitForPageLoad2"/>
5881
<seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
5982
<seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
60-
<after>
61-
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
62-
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
63-
<argument name="FolderName" value="Storage Root"/>
64-
</actionGroup>
65-
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
66-
<argument name="FolderName" value="wysiwyg"/>
67-
</actionGroup>
68-
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
69-
<argument name="ImageFolder" value="ImageFolder"/>
70-
</actionGroup>
71-
<actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
72-
<argument name="categoryEntity" value="SimpleSubCategory"/>
73-
</actionGroup>
74-
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
75-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
76-
</after>
7783
</test>
7884
</tests>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
23+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
24+
<argument name="enabled" value="0"/>
25+
</actionGroup>
2326
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2427
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2528
</before>
@@ -36,6 +39,9 @@
3639
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
3740
<argument name="Image" value="{{ImageFolder.name}}"/>
3841
</actionGroup>
42+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
43+
<argument name="enabled" value="1"/>
44+
</actionGroup>
3945
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4046
</after>
4147

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,35 @@
2121
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2222
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
24+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
25+
<argument name="enabled" value="0"/>
26+
</actionGroup>
2427
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2528
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2629
</before>
30+
<after>
31+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
32+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
33+
<argument name="FolderName" value="Storage Root"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
36+
<argument name="FolderName" value="wysiwyg"/>
37+
</actionGroup>
38+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
39+
<argument name="ImageFolder" value="ImageFolder"/>
40+
</actionGroup>
41+
<actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="amOnEditPage"/>
42+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad"/>
43+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
44+
<waitForPageLoad stepKey="waitForGridReload"/>
45+
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
46+
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
47+
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
48+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
49+
<argument name="enabled" value="1"/>
50+
</actionGroup>
51+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
52+
</after>
2753
<actionGroup ref="AssignBlockToCMSPage" stepKey="assignBlockToCMSPage">
2854
<argument name="Block" value="$$createPreReqBlock$$"/>
2955
<argument name="CmsPage" value="$$createCMSPage$$"/>
@@ -62,25 +88,5 @@
6288
<!--see image on Storefront-->
6389
<seeElement selector="{{StorefrontBlockSection.mediaDescription}}" stepKey="assertMediaDescription"/>
6490
<seeElementInDOM selector="{{StorefrontBlockSection.imageSource(ImageUpload.fileName)}}" stepKey="assertMediaSource"/>
65-
<after>
66-
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
67-
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
68-
<argument name="FolderName" value="Storage Root"/>
69-
</actionGroup>
70-
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
71-
<argument name="FolderName" value="wysiwyg"/>
72-
</actionGroup>
73-
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
74-
<argument name="ImageFolder" value="ImageFolder"/>
75-
</actionGroup>
76-
<actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="amOnEditPage"/>
77-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad"/>
78-
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
79-
<waitForPageLoad stepKey="waitForGridReload"/>
80-
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
81-
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
82-
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
83-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
84-
</after>
8591
</test>
8692
</tests>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<before>
2121
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
23+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
24+
<argument name="enabled" value="0"/>
25+
</actionGroup>
2326
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2427
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2528
</before>
@@ -37,6 +40,9 @@
3740
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYGFirst"/>
3841
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
3942
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
43+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<argument name="enabled" value="1"/>
45+
</actionGroup>
4046
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4147
</after>
4248

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddLargeImageToWYSIWYGCMSTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,18 @@
2020
<before>
2121
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
23+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
24+
<argument name="enabled" value="0"/>
25+
</actionGroup>
2326
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2427
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2528
</before>
2629
<after>
2730
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage" />
2831
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
32+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
33+
<argument name="enabled" value="1"/>
34+
</actionGroup>
2935
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3036
</after>
3137

‎app/code/Magento/Cms/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,18 @@
2222
<before>
2323
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
25+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<argument name="enabled" value="0"/>
27+
</actionGroup>
2528
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2629
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2730
</before>
28-
2931
<after>
3032
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
3133
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
34+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
35+
<argument name="enabled" value="1"/>
36+
</actionGroup>
3237
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3338
</after>
3439

‎app/code/Magento/Cms/Test/Mftf/Test/AdminMediaGalleryPopupUploadImagesWithoutErrorTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<comment userInput="Create block" stepKey="commentCreateBlock"/>
2828
<createData entity="Sales25offBlock" stepKey="createBlock"/>
2929
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
30+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
31+
<argument name="enabled" value="0"/>
32+
</actionGroup>
3033
</before>
3134
<after>
3235
<!--Disable WYSIWYG options-->
@@ -44,6 +47,9 @@
4447
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
4548
<argument name="ImageFolder" value="ImageFolder"/>
4649
</actionGroup>
50+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
51+
<argument name="enabled" value="1"/>
52+
</actionGroup>
4753
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4854
</after>
4955
<!--Open created block page and add image-->

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,16 @@
2020
</annotations>
2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
24+
<argument name="enabled" value="0"/>
25+
</actionGroup>
2326
</before>
27+
<after>
28+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
29+
<argument name="enabled" value="1"/>
30+
</actionGroup>
31+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
32+
</after>
2433
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
2534
<actionGroup ref="AssertAdminPageIs404ActionGroup" stepKey="see404Page"/>
2635
</test>

‎app/code/Magento/MediaGalleryUi/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<default>
1010
<system>
1111
<media_gallery>
12-
<enabled>0</enabled>
12+
<enabled>1</enabled>
1313
</media_gallery>
1414
</system>
1515
</default>

‎app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,29 @@
1919
</annotations>
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
22+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
23+
<argument name="enabled" value="0"/>
24+
</actionGroup>
2225
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2326
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2427
</before>
28+
<after>
29+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
30+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
31+
<argument name="FolderName" value="Storage Root"/>
32+
</actionGroup>
33+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
34+
<argument name="FolderName" value="wysiwyg"/>
35+
</actionGroup>
36+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
37+
<argument name="ImageFolder" value="ImageFolder"/>
38+
</actionGroup>
39+
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
40+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
41+
<argument name="enabled" value="1"/>
42+
</actionGroup>
43+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
44+
</after>
2545
<!--Create a newsletter template that contains an image-->
2646
<amOnPage url="{{NewsletterTemplateForm.url}}" stepKey="amOnNewsletterTemplatePage"/>
2747
<waitForPageLoad stepKey="waitForPageLoad1"/>
@@ -63,20 +83,6 @@
6383
<seeElement selector="{{StorefrontNewsletterSection.mediaDescription}}" stepKey="assertMediaDescription"/>
6484
<seeElementInDOM selector="{{StorefrontNewsletterSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
6585
<closeTab stepKey="closeTab"/>
66-
<after>
67-
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
68-
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
69-
<argument name="FolderName" value="Storage Root"/>
70-
</actionGroup>
71-
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
72-
<argument name="FolderName" value="wysiwyg"/>
73-
</actionGroup>
74-
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
75-
<argument name="ImageFolder" value="ImageFolder"/>
76-
</actionGroup>
77-
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
78-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
79-
</after>
8086
</test>
8187
</tests>
8288

0 commit comments

Comments
 (0)