Skip to content

Commit cf51b56

Browse files
joanhejoanhe
authored
Merge pull request #103 from magento-arcticfoxes/B2B-1898
B2B-1898
2 parents b642ec4 + 3bb5c8f commit cf51b56

9 files changed

+288
-117
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTests.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,14 @@
240240
<!--Overwrite uploaded image by selecting image from Media Gallery Storage-->
241241
<click selector="{{CategoryContentSection.SelectFromGalleryBtn}}" stepKey="clickSelectFromGalleryBtn"/>
242242
<waitForPageLoad stepKey="waitForPageLoad1"/>
243-
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
244-
<waitForPageLoad stepKey="waitForPageLoad"/>
243+
<comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
244+
<comment userInput="BIC workaround" stepKey="waitForPageLoad"/>
245+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
246+
<argument name="FolderName" value="Storage Root"/>
247+
</actionGroup>
248+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
249+
<argument name="FolderName" value="wysiwyg"/>
250+
</actionGroup>
245251
<actionGroup ref="CreateImageFolderActionGroup" stepKey="createImageFolder">
246252
<argument name="ImageFolder" value="ImageFolder"/>
247253
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTests.xml‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -694,11 +694,16 @@
694694
</before>
695695
<after>
696696
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
697-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
697+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
698+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
698699
<argument name="FolderName" value="Storage Root"/>
699700
</actionGroup>
700-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
701-
<argument name="Image" value="PageBuilderBackgroundImageRoot_JPG"/>
701+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
702+
<argument name="FolderName" value="wysiwyg"/>
703+
</actionGroup>
704+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
705+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
706+
<argument name="Image" value="{{ImageFolder.name}}"/>
702707
</actionGroup>
703708
<actionGroup ref="logout" stepKey="logout"/>
704709
</after>
@@ -719,9 +724,16 @@
719724
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
720725
<argument name="property" value="PageBuilderBackgroundImageRoot_JPG"/>
721726
</actionGroup>
722-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
727+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
728+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
723729
<argument name="FolderName" value="Storage Root"/>
724730
</actionGroup>
731+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
732+
<argument name="FolderName" value="wysiwyg"/>
733+
</actionGroup>
734+
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
735+
<argument name="ImageFolder" value="ImageFolder"/>
736+
</actionGroup>
725737
<actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
726738
<argument name="Image" value="PageBuilderBackgroundImageRoot_JPG"/>
727739
</actionGroup>
@@ -736,7 +748,7 @@
736748
<!-- Return the string value of background-image -->
737749
<executeJS function="return '{$contentTypeStyle}'.match(/((?&lt;=(background-image: url\((&quot;|\'))).+(?=(&quot;|\')\);))/)[0]" stepKey="backgroundImageValue"/>
738750
<assertRegExp stepKey="assertBackgroundImageContainsFileInformation">
739-
<expectedResult type="string">/\/pub\/media\/{{PageBuilderBackgroundImageRoot_JPG.fileName}}(_\d+)?\.{{PageBuilderBackgroundImageRoot_JPG.extension}}/</expectedResult>
751+
<expectedResult type="string">/\/pub\/media\/wysiwyg\/{{ImageFolder.name}}\/{{PageBuilderBackgroundImageRoot_JPG.fileName}}(_\d+)?\.{{PageBuilderBackgroundImageRoot_JPG.extension}}/</expectedResult>
740752
<actualResult type="variable">$backgroundImageValue</actualResult>
741753
</assertRegExp>
742754
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
@@ -1268,11 +1280,16 @@
12681280
<after>
12691281
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
12701282
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
1271-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
1283+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
1284+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
12721285
<argument name="FolderName" value="Storage Root"/>
12731286
</actionGroup>
1274-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
1275-
<argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
1287+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
1288+
<argument name="FolderName" value="wysiwyg"/>
1289+
</actionGroup>
1290+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
1291+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
1292+
<argument name="Image" value="{{ImageFolder.name}}"/>
12761293
</actionGroup>
12771294
<actionGroup ref="logout" stepKey="logout"/>
12781295
</after>
@@ -1293,9 +1310,16 @@
12931310
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
12941311
<argument name="property" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
12951312
</actionGroup>
1296-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
1313+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
1314+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
12971315
<argument name="FolderName" value="Storage Root"/>
12981316
</actionGroup>
1317+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
1318+
<argument name="FolderName" value="wysiwyg"/>
1319+
</actionGroup>
1320+
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
1321+
<argument name="ImageFolder" value="ImageFolder"/>
1322+
</actionGroup>
12991323
<actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
13001324
<argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
13011325
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTests.xml‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,16 @@
125125
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
126126
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
127127
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
128-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
129-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
128+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
129+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
130+
<argument name="FolderName" value="Storage Root"/>
130131
</actionGroup>
131-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
132-
<argument name="Image" value="ImageUpload3"/>
132+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
133+
<argument name="FolderName" value="wysiwyg"/>
134+
</actionGroup>
135+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
136+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
137+
<argument name="Image" value="{{ImageFolder.name}}"/>
133138
</actionGroup>
134139
<actionGroup ref="logout" stepKey="logout"/>
135140
</after>
@@ -171,7 +176,12 @@
171176
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
172177
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
173178
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
174-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
179+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="clickMediaGalleryStorageRootArrow">
180+
<argument name="FolderName" value="Storage Root"/>
181+
</actionGroup>
182+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
183+
<argument name="FolderName" value="wysiwyg"/>
184+
</actionGroup>
175185
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
176186
<argument name="ImageFolder" value="ImageFolder"/>
177187
</actionGroup>
@@ -975,11 +985,16 @@
975985
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
976986
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
977987
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
978-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
979-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
988+
<comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
989+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
990+
<argument name="FolderName" value="Storage Root"/>
980991
</actionGroup>
981-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
982-
<argument name="Image" value="ImageUpload3"/>
992+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
993+
<argument name="FolderName" value="wysiwyg"/>
994+
</actionGroup>
995+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage2"/>
996+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
997+
<argument name="Image" value="{{ImageFolder.name}}"/>
983998
</actionGroup>
984999
<actionGroup ref="logout" stepKey="logout"/>
9851000
</after>
@@ -1006,7 +1021,12 @@
10061021
<argument name="page" value="$$createCMSPage.identifier$$"/>
10071022
</actionGroup>
10081023
<actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
1009-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
1024+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="clickMediaGalleryStorageRootArrow">
1025+
<argument name="FolderName" value="Storage Root"/>
1026+
</actionGroup>
1027+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
1028+
<argument name="FolderName" value="wysiwyg"/>
1029+
</actionGroup>
10101030
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
10111031
<argument name="ImageFolder" value="ImageFolder"/>
10121032
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTests.xml‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,11 +1156,16 @@
11561156
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
11571157
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
11581158
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
1159-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
1160-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
1159+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
1160+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
1161+
<argument name="FolderName" value="Storage Root"/>
11611162
</actionGroup>
1162-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
1163-
<argument name="Image" value="ImageUpload3"/>
1163+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
1164+
<argument name="FolderName" value="wysiwyg"/>
1165+
</actionGroup>
1166+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
1167+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
1168+
<argument name="Image" value="{{ImageFolder.name}}"/>
11641169
</actionGroup>
11651170
<actionGroup ref="logout" stepKey="logout"/>
11661171
</after>
@@ -1218,7 +1223,12 @@
12181223
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
12191224
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
12201225
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
1221-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
1226+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="clickMediaGalleryStorageRootArrow">
1227+
<argument name="FolderName" value="Storage Root"/>
1228+
</actionGroup>
1229+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
1230+
<argument name="FolderName" value="wysiwyg"/>
1231+
</actionGroup>
12221232
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
12231233
<argument name="ImageFolder" value="ImageFolder"/>
12241234
</actionGroup>
@@ -2078,11 +2088,16 @@
20782088
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
20792089
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
20802090
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
2081-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
2082-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
2091+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
2092+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
2093+
<argument name="FolderName" value="Storage Root"/>
20832094
</actionGroup>
2084-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
2085-
<argument name="Image" value="ImageUpload3"/>
2095+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
2096+
<argument name="FolderName" value="wysiwyg"/>
2097+
</actionGroup>
2098+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
2099+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
2100+
<argument name="Image" value="{{ImageFolder.name}}"/>
20862101
</actionGroup>
20872102
<actionGroup ref="logout" stepKey="logout"/>
20882103
</after>
@@ -2140,7 +2155,12 @@
21402155
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
21412156
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
21422157
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
2143-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
2158+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="clickMediaGalleryStorageRootArrow">
2159+
<argument name="FolderName" value="Storage Root"/>
2160+
</actionGroup>
2161+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
2162+
<argument name="FolderName" value="wysiwyg"/>
2163+
</actionGroup>
21442164
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
21452165
<argument name="ImageFolder" value="ImageFolder"/>
21462166
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest.xml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,16 @@
3131
<after>
3232
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3333
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
34-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
35-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
34+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
35+
<argument name="FolderName" value="Storage Root"/>
3636
</actionGroup>
37-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
38-
<argument name="Image" value="ImageUpload3"/>
37+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
38+
<argument name="FolderName" value="wysiwyg"/>
39+
</actionGroup>
40+
<comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
41+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage2"/>
42+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
43+
<argument name="ImageFolder" value="ImageFolder"/>
3944
</actionGroup>
4045
<actionGroup ref="logout" stepKey="logout"/>
4146
</after>
@@ -58,7 +63,13 @@
5863
<argument name="page" value="$$createCMSPage.identifier$$"/>
5964
</actionGroup>
6065
<actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
61-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
66+
<comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
67+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
68+
<argument name="FolderName" value="Storage Root"/>
69+
</actionGroup>
70+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
71+
<argument name="FolderName" value="wysiwyg"/>
72+
</actionGroup>
6273
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
6374
<argument name="ImageFolder" value="ImageFolder"/>
6475
</actionGroup>

0 commit comments

Comments
 (0)