Skip to content

Commit 371f30a

Browse files
eug123eug123
committed
Merge remote-tracking branch 'mainline/1.1-develop' into PB-69
2 parents 38569b3 + 0b49c4b commit 371f30a

30 files changed

+323
-79
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="attachFileSlideOutProperty">
12+
<annotations>
13+
<description>Uploads the provided Image to the wysiwyg directory in the Media Gallery from Page Builder's slide out edit form for a content type.
14+
If you use this action group, you MUST add steps to delete the image in the "after" steps. </description>
15+
</annotations>
1216
<arguments>
1317
<argument name="property"/>
1418
</arguments>
@@ -17,6 +21,10 @@
1721
<waitForElementVisible selector="{{EditPanelForm.backgroundImagePreview}}" stepKey="waitForImageUpload"/>
1822
</actionGroup>
1923
<actionGroup name="attachFileSlideOutPropertyGeneral">
24+
<annotations>
25+
<description>Uploads the provided Image to the wysiwyg directory in the Media Gallery from Page Builder's slide out edit form for a content type.
26+
If you use this action group, you MUST add steps to delete the image in the "after" steps. </description>
27+
</annotations>
2028
<arguments>
2129
<argument name="property"/>
2230
</arguments>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,20 @@
148148
<seeElementInDOM selector="{{CmsNewPagePageContentSection.content}}" stepKey="seeContentAreaInDOM"/>
149149
<dontSeeElementInDOM selector="{{PageBuilderStage.stageWrapper}}" stepKey="dontSeePageBuilderStage"/>
150150
</test>
151+
<test name="CheckOrderOfProdsInWidgetOnCMSPageTest">
152+
<before>
153+
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginAsAdmin"/>
154+
</before>
155+
<after>
156+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="logoutOfAdmin"/>
157+
</after>
158+
</test>
159+
<test name="AdminMediaGalleryPopupUploadImagesWithoutErrorTest">
160+
<before>
161+
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" before="enableWYSIWYGEditor"/>
162+
</before>
163+
<after>
164+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="disableWYSIWYG"/>
165+
</after>
166+
</test>
151167
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
148148
</before>
149149
<after>
150-
<closeTab stepKey="closeTab"/>
151150
<actionGroup ref="logout" stepKey="logout"/>
151+
<closeTab stepKey="closeTab"/>
152152
</after>
153153
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
154154
<argument name="contentType" value="PageBuilderRowContentType"/>

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,13 @@
9999
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
100100
<deleteData createDataKey="createCMSPageA" stepKey="deletePreReqCmsPageA"/>
101101
<deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCmsPageB"/>
102+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
103+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
104+
<argument name="FolderName" value="{{PageBuilderImageProperty_StageJPG.path}}"/>
105+
</actionGroup>
106+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
107+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
108+
</actionGroup>
102109
<actionGroup ref="logout" stepKey="logout"/>
103110
</after>
104111
<actionGroup ref="openPageBuilderForAttribute" stepKey="enablePageBuilderOnCatalog"/>
@@ -333,8 +340,8 @@
333340
</before>
334341
<after>
335342
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
336-
<closeTab stepKey="closeTab"/>
337343
<actionGroup ref="logout" stepKey="logout"/>
344+
<closeTab stepKey="closeTab"/>
338345
</after>
339346
<actionGroup ref="openPageBuilderForAttribute" stepKey="enablePageBuilderOnCatalog"/>
340347
<!-- Set background color of row -->

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@
3737
<deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct"/>
3838
<deleteData createDataKey="createCMSPageA" stepKey="deletePreReqCmsPageA"/>
3939
<deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCmsPageB"/>
40+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
41+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
42+
<argument name="FolderName" value="{{PageBuilderImageProperty_StageJPG.path}}"/>
43+
</actionGroup>
44+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
45+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
46+
</actionGroup>
4047
<actionGroup ref="logout" stepKey="logout"/>
4148
</after>
4249
<!--Go to Product Page-->
@@ -557,9 +564,9 @@
557564
</actionGroup>
558565
</before>
559566
<after>
560-
<closeTab stepKey="closeTab"/>
561567
<actionGroup ref="logout" stepKey="logout"/>
562568
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
569+
<closeTab stepKey="closeTab"/>
563570
</after>
564571
<!-- Add PageBuilder description -->
565572
<comment userInput="Add PageBuilder description" stepKey="commentAddDescription"/>
@@ -796,10 +803,10 @@
796803
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
797804
</before>
798805
<after>
799-
<closeTab stepKey="closeTab"/>
800806
<deleteData createDataKey="createPageBuilderAttribute1" stepKey="deleteAttribute1"/>
801807
<deleteData createDataKey="createPageBuilderAttribute2" stepKey="deleteAttribute2"/>
802808
<actionGroup ref="logout" stepKey="logout"/>
809+
<closeTab stepKey="closeTab"/>
803810
</after>
804811
<!-- Update created attributes to enable Page Builder -->
805812
<comment userInput="Update created attributes to enable Page Builder" stepKey="commentUpdateAttributes"/>

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

Lines changed: 0 additions & 45 deletions
This file was deleted.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
6666
</before>
6767
<after>
68-
<closeTab stepKey="closeTab"/>
6968
<actionGroup ref="logout" stepKey="logout"/>
69+
<closeTab stepKey="closeTab"/>
7070
</after>
7171
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
7272
<argument name="contentType" value="PageBuilderBannerContentType"/>
@@ -727,8 +727,8 @@
727727
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
728728
</before>
729729
<after>
730-
<closeTab stepKey="closeTab"/>
731730
<actionGroup ref="logout" stepKey="logout"/>
731+
<closeTab stepKey="closeTab"/>
732732
</after>
733733
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
734734
<argument name="contentType" value="PageBuilderBannerContentType"/>
@@ -865,8 +865,8 @@
865865
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
866866
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
867867
</actionGroup>
868-
<closeTab stepKey="closeTab"/>
869868
<actionGroup ref="logout" stepKey="logout"/>
869+
<closeTab stepKey="closeTab"/>
870870
</after>
871871
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
872872
<argument name="contentType" value="PageBuilderBannerContentType"/>
@@ -1878,8 +1878,8 @@
18781878
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
18791879
</before>
18801880
<after>
1881-
<closeTab stepKey="closeOpenedTab"/>
18821881
<actionGroup ref="logout" stepKey="logout"/>
1882+
<closeTab stepKey="closeOpenedTab"/>
18831883
</after>
18841884
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
18851885
<argument name="contentType" value="PageBuilderBannerContentType"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1681,8 +1681,8 @@
16811681
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
16821682
</before>
16831683
<after>
1684-
<closeTab stepKey="closeTab"/>
16851684
<actionGroup ref="logout" stepKey="logout"/>
1685+
<closeTab stepKey="closeTab"/>
16861686
</after>
16871687
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
16881688
<argument name="contentType" value="PageBuilderBannerContentType"/>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,13 @@
124124
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
125125
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
126126
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
127+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
128+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
129+
<argument name="FolderName" value="{{ImageFolder.name}}"/>
130+
</actionGroup>
131+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
132+
<argument name="Image" value="ImageUpload3"/>
133+
</actionGroup>
127134
<actionGroup ref="logout" stepKey="logout"/>
128135
</after>
129136
<!-- Add Text -->

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,13 @@
883883
<deleteData createDataKey="createPreReqCMSPage" stepKey="deletePreReqCMSPage"/>
884884
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
885885
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
886+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
887+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
888+
<argument name="FolderName" value="{{ImageFolder.name}}"/>
889+
</actionGroup>
890+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
891+
<argument name="Image" value="ImageUpload3"/>
892+
</actionGroup>
886893
<actionGroup ref="logout" stepKey="logout"/>
887894
</after>
888895
<!-- Add Banner -->
@@ -1774,6 +1781,13 @@
17741781
<deleteData createDataKey="createPreReqCMSPage" stepKey="deletePreReqCMSPage"/>
17751782
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
17761783
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
1784+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
1785+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
1786+
<argument name="FolderName" value="{{ImageFolder.name}}"/>
1787+
</actionGroup>
1788+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
1789+
<argument name="Image" value="ImageUpload3"/>
1790+
</actionGroup>
17771791
<actionGroup ref="logout" stepKey="logout"/>
17781792
</after>
17791793
<!-- Add Slider -->

0 commit comments

Comments
 (0)