Skip to content

Commit e03c55e

Browse files
krissyhiserotekrissyhiserote
committed
Merge remote-tracking branch 'mainline/develop' into AC-397-move-modal-to-body
2 parents d2c58d7 + 244bb79 commit e03c55e

File tree

22 files changed

+364
-135
lines changed

22 files changed

+364
-135
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderNewMediaGalleryRenditionsSuite.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,21 @@
88
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
99
<suite name="PageBuilderNewMediaGalleryRenditionsSuite">
1010
<before>
11-
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="disableWYSIWYG" />
11+
<actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG" />
1212
<magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="enableEnhancedMediaGallery"/>
1313
<magentoCLI command="config:set {{MediaGalleryRenditionsDataEnabled.path}} {{MediaGalleryRenditionsDataEnabled.value}}" stepKey="enableMediaGalleryRenditions"/>
14+
15+
<!-- Create Media Gallery Directories for `wysiwyg` -->
16+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
17+
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
18+
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
19+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
20+
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
1421
</before>
1522
<after>
1623
<magentoCLI command="config:set {{MediaGalleryRenditionsDataDisabled.path}} {{MediaGalleryRenditionsDataDisabled.value}}" stepKey="disableMediaGalleryRenditions"/>
1724
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="disableEnhancedMediaGallery"/>
18-
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG" />
25+
<actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
1926
</after>
2027
<include>
2128
<group name="page_builder_new_media_gallery_renditions"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithImageTest.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2222
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGalleryBefore"/>
2323
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridBefore"/>
24+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="openWysiwygFolder">
25+
<argument name="name" value="wysiwyg"/>
26+
</actionGroup>
2427
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
2528
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
2629
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
@@ -32,10 +35,13 @@
3235
<after>
3336
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryAfter"/>
3437
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAfter"/>
38+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
39+
<argument name="FolderName" value="wysiwyg"/>
40+
</actionGroup>
3541
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAfter">
3642
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
3743
</actionGroup>
38-
<actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/>
44+
<comment userInput="BIC workaround" stepKey="deleteImage"/>
3945
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
4046
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4147
<deleteData createDataKey="createCMSPage" stepKey="deleteCmsPage"/>
@@ -60,6 +66,9 @@
6066
</actionGroup>
6167
<actionGroup ref="AdminOpenSelectImageFromGalleryActionGroup" stepKey="openMediaGallery"/>
6268
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGrid"/>
69+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
70+
<argument name="FolderName" value="wysiwyg"/>
71+
</actionGroup>
6372
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolder">
6473
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
6574
</actionGroup>
@@ -75,11 +84,13 @@
7584
<!-- Check if Image have "used in" data section -->
7685
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
7786
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
87+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder2">
88+
<argument name="FolderName" value="wysiwyg"/>
89+
</actionGroup>
7890
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolderToCheck">
7991
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
8092
</actionGroup>
8193
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
82-
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup"
83-
stepKey="assertUsedInSectionDisplayed"/>
94+
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup" stepKey="assertUsedInSectionDisplayed"/>
8495
</test>
8596
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSelectFromGalleryJPGTest.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,16 @@
3131
</before>
3232
<after>
3333
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
34-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
34+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
35+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
3536
<argument name="FolderName" value="Storage Root"/>
3637
</actionGroup>
37-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
38-
<argument name="Image" value="PageBuilderBackgroundImageRoot_JPG"/>
38+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
39+
<argument name="FolderName" value="wysiwyg"/>
40+
</actionGroup>
41+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
42+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
43+
<argument name="Image" value="{{ImageFolder.name}}"/>
3944
</actionGroup>
4045
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4146
</after>
@@ -56,9 +61,16 @@
5661
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
5762
<argument name="property" value="PageBuilderBackgroundImageRoot_JPG"/>
5863
</actionGroup>
59-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
64+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
65+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
6066
<argument name="FolderName" value="Storage Root"/>
6167
</actionGroup>
68+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
69+
<argument name="FolderName" value="wysiwyg"/>
70+
</actionGroup>
71+
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
72+
<argument name="ImageFolder" value="ImageFolder"/>
73+
</actionGroup>
6274
<actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
6375
<argument name="Image" value="PageBuilderBackgroundImageRoot_JPG"/>
6476
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSelectFromGalleryJPGTest.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,16 @@
3232
<after>
3333
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
3434
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
35-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
35+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
36+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
3637
<argument name="FolderName" value="Storage Root"/>
3738
</actionGroup>
38-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
39-
<argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
39+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
40+
<argument name="FolderName" value="wysiwyg"/>
41+
</actionGroup>
42+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
43+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
44+
<argument name="Image" value="{{ImageFolder.name}}"/>
4045
</actionGroup>
4146
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4247
</after>
@@ -57,9 +62,16 @@
5762
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
5863
<argument name="property" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
5964
</actionGroup>
60-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
65+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
66+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
6167
<argument name="FolderName" value="Storage Root"/>
6268
</actionGroup>
69+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
70+
<argument name="FolderName" value="wysiwyg"/>
71+
</actionGroup>
72+
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
73+
<argument name="ImageFolder" value="ImageFolder"/>
74+
</actionGroup>
6375
<actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
6476
<argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
6577
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,13 @@
3333
<after>
3434
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3535
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
36-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToMediaGalleryNavigateToFolder">
37-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
36+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
37+
<argument name="FolderName" value="Storage Root"/>
3838
</actionGroup>
39+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
40+
<argument name="FolderName" value="wysiwyg"/>
41+
</actionGroup>
42+
<comment userInput="BIC workaround" stepKey="navigateToMediaGalleryNavigateToFolder"/>
3943
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
4044
<argument name="ImageFolder" value="ImageFolder"/>
4145
</actionGroup>
@@ -94,7 +98,13 @@
9498
<!-- Add Image Link to TinyMCE -->
9599
<actionGroup ref="ClickTinyMCEInsertImageButtonActionGroup" stepKey="clickTinyMCEInsertImageButton"/>
96100
<actionGroup ref="GoToMediaGalleryFromTinyMCEImageModalActionGroup" stepKey="goToMediaGalleryFromTinyMCEImageModal"/>
97-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
101+
<comment userInput="BIC workaround" stepKey="clickTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
102+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
103+
<argument name="FolderName" value="Storage Root"/>
104+
</actionGroup>
105+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
106+
<argument name="FolderName" value="wysiwyg"/>
107+
</actionGroup>
98108
<actionGroup ref="CreateImageFolderActionGroup" stepKey="createTinyMCESelectorBrowseModalStorageRootImageFolder">
99109
<argument name="ImageFolder" value="ImageFolder"/>
100110
</actionGroup>
@@ -188,7 +198,16 @@
188198
<argument name="wysiwygArea" value="{{WYSIWYGOnPageBuilderInline.inlineCss}}"/>
189199
</actionGroup>
190200
<actionGroup ref="GoToMediaGalleryFromTinyMCEImageModalActionGroup" stepKey="goToMediaGalleryFromInlineWYSIWYGTinyMCEImageModal"/>
191-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickInlineWYSIWYGTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
201+
<comment userInput="BIC workaround" stepKey="clickInlineWYSIWYGTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
202+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder2">
203+
<argument name="FolderName" value="Storage Root"/>
204+
</actionGroup>
205+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder2">
206+
<argument name="FolderName" value="wysiwyg"/>
207+
</actionGroup>
208+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToImageFolderFolder">
209+
<argument name="FolderName" value="{{ImageFolder.name}}"/>
210+
</actionGroup>
192211
<actionGroup ref="AttachImageActionGroup" stepKey="selectImageFromInlineWYSIWYGTinyMCESelectorBrowseModalStorageRootImageFolder">
193212
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
194213
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,16 @@
3838
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
3939
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
4040
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
41-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
42-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
41+
<comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
42+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
43+
<argument name="FolderName" value="Storage Root"/>
4344
</actionGroup>
44-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
45-
<argument name="Image" value="ImageUpload3"/>
45+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
46+
<argument name="FolderName" value="wysiwyg"/>
47+
</actionGroup>
48+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage2"/>
49+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
50+
<argument name="Image" value="{{ImageFolder.name}}"/>
4651
</actionGroup>
4752
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4853
</after>
@@ -69,7 +74,12 @@
6974
<argument name="page" value="$$createCMSPage.identifier$$"/>
7075
</actionGroup>
7176
<actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
72-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
77+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="clickMediaGalleryStorageRootArrow">
78+
<argument name="FolderName" value="Storage Root"/>
79+
</actionGroup>
80+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
81+
<argument name="FolderName" value="wysiwyg"/>
82+
</actionGroup>
7383
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
7484
<argument name="ImageFolder" value="ImageFolder"/>
7585
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,16 @@
4242
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
4343
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
4444
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
45-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
46-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
45+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
46+
<argument name="FolderName" value="Storage Root"/>
4747
</actionGroup>
48-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
49-
<argument name="Image" value="ImageUpload3"/>
48+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
49+
<argument name="FolderName" value="wysiwyg"/>
50+
</actionGroup>
51+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
52+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
53+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
54+
<argument name="ImageFolder" value="ImageFolder"/>
5055
</actionGroup>
5156
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5257
</after>
@@ -94,7 +99,13 @@
9499
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
95100
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
96101
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
97-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
102+
<comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
103+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
104+
<argument name="FolderName" value="Storage Root"/>
105+
</actionGroup>
106+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
107+
<argument name="FolderName" value="wysiwyg"/>
108+
</actionGroup>
98109
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
99110
<argument name="ImageFolder" value="ImageFolder"/>
100111
</actionGroup>

0 commit comments

Comments
 (0)