Skip to content

Commit b5079bf

Browse files
yolouieseyolouiese
committed
#703: Automate MC-4985, MC-4990, MC-30862 - transferred fixes of MC-4985 and MC-30862 to MC-4990 pr
1 parent cff4ba3 commit b5079bf

File tree

4 files changed

+291
-0
lines changed

4 files changed

+291
-0
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageWithSecretKeyEnabledActionGroup.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="NavigateToPageBuilderTemplatesGridPageWithSecretKeyEnabledActionGroup">
11+
<annotations>
12+
<description>Navigates to the Page Builder Templates grid page with Secret Key Enabled.</description>
13+
</annotations>
14+
<remove keyForRemoval="goToPageBuilderTemplatesGridPage"/>
15+
</actionGroup>
16+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,10 @@
141141
<item name="Magento_PageBuilder::template_delete">Magento_PageBuilder::template_delete</item>
142142
</array>
143143
</entity>
144+
<!-- Admin Menu -->
145+
<entity name="AdminMenuContentElementsTemplates">
146+
<data key="pageTitle">Templates</data>
147+
<data key="title">Templates</data>
148+
<data key="dataUiId">magento-pagebuilder-templates</data>
149+
</entity>
144150
</entities>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderUploadImageWithSecretKeyEnabledTest.xml

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="SliderUploadImageWithSecretKeyEnabledTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Slider"/>
14+
<title value="Slider - Upload Image to Slider w/ Secret Key Enabled"/>
15+
<description value="Verify that user are able to upload image to Slider when Secret URL Key is enabled"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="MC-4985"/>
18+
<group value="pagebuilder"/>
19+
<group value="pagebuilder-slider"/>
20+
<group value="pagebuilder-sliderCommon"/>
21+
</annotations>
22+
<before>
23+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<magentoCLI command="config:set admin/security/use_form_key 0" stepKey="disableUrlSecretKeys1"/>
26+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches1">
27+
<argument name="tags" value="config full_page"/>
28+
</actionGroup>
29+
<reloadPage stepKey="reloadPage1"/>
30+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
31+
<argument name="CMSPage" value="$$createCMSPage$$"/>
32+
</actionGroup>
33+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
34+
</before>
35+
<after>
36+
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
37+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
38+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
39+
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
40+
</actionGroup>
41+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
42+
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
43+
</actionGroup>
44+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
45+
</after>
46+
<!-- Add Row -->
47+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
48+
<argument name="contentType" value="PageBuilderRowContentType"/>
49+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
50+
</actionGroup>
51+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
52+
<argument name="contentType" value="PageBuilderSliderContentType"/>
53+
</actionGroup>
54+
<!-- Add Slider to Row -->
55+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
56+
<argument name="contentType" value="PageBuilderSliderContentType"/>
57+
</actionGroup>
58+
<!-- Save CMS Page -->
59+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1"/>
60+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage1"/>
61+
62+
<!-- Enable Secret Key -->
63+
<magentoCLI command="config:set admin/security/use_form_key 1" stepKey="enableUrlSecretKeys"/>
64+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches2">
65+
<argument name="tags" value="config full_page"/>
66+
</actionGroup>
67+
<reloadPage stepKey="reloadPage2"/>
68+
69+
<!-- Navigate to CMS Page -->
70+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentPagesPage">
71+
<argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
72+
<argument name="submenuUiId" value="{{AdminMenuContentElementsPages.dataUiId}}"/>
73+
</actionGroup>
74+
<actionGroup ref="NavigateToCreatedCMSPageWithEnabledSecretKeyActionGroup" stepKey="navigateToCreatedCMSPage2">
75+
<argument name="CMSPage" value="$$createCMSPage$$"/>
76+
</actionGroup>
77+
78+
<!-- Upload Image to Slide -->
79+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
80+
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons">
81+
<argument name="contentType" value="PageBuilderSliderContentType"/>
82+
</actionGroup>
83+
<attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
84+
<waitForPageLoad stepKey="waitForPageLoad"/>
85+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
86+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage2"/>
87+
88+
<!-- Navigate To Storefront -->
89+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
90+
<argument name="page" value="$$createCMSPage.identifier$$"/>
91+
</actionGroup>
92+
93+
<!-- Validate Storefront - Secret Key Enabled -->
94+
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageStorefront1">
95+
<argument name="section" value="SlideOnFrontend"/>
96+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
97+
</actionGroup>
98+
99+
<!-- Disable Secret Key -->
100+
<magentoCLI command="config:set admin/security/use_form_key 0" stepKey="disableUrlSecretKeys2"/>
101+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches3">
102+
<argument name="tags" value="config full_page"/>
103+
</actionGroup>
104+
<reloadPage stepKey="reloadPage3"/>
105+
106+
<!-- Validate Storefront - Secret Key Disabled -->
107+
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageStorefront2">
108+
<argument name="section" value="SlideOnFrontend"/>
109+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
110+
</actionGroup>
111+
</test>
112+
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateWithSecretKeyTest.xml

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="PageBuilderCreateTemplateWithSecretKeyTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Templates"/>
14+
<title value="Templates - Create Page Builder Template w/ Secret Key Enabled"/>
15+
<description value="Verify that users are able to create Page Builder templates with working screenshots when Secret URL Key is enabled. Also, disabling secret keys does not affect created screenshots."/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="MC-30862"/>
18+
<group value="pagebuilder"/>
19+
<group value="pagebuilder-templates"/>
20+
</annotations>
21+
<before>
22+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
<!-- Enable Secret Key -->
25+
<magentoCLI command="config:set admin/security/use_form_key 1" stepKey="enableUrlSecretKeys"/>
26+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches1">
27+
<argument name="tags" value="config full_page"/>
28+
</actionGroup>
29+
<reloadPage stepKey="reloadPage1"/>
30+
<!-- Navigate to CMS Page -->
31+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentPagesPage">
32+
<argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
33+
<argument name="submenuUiId" value="{{AdminMenuContentElementsPages.dataUiId}}"/>
34+
</actionGroup>
35+
<actionGroup ref="NavigateToCreatedCMSPageWithEnabledSecretKeyActionGroup" stepKey="navigateToCreatedCMSPage1">
36+
<argument name="CMSPage" value="$$createCMSPage$$"/>
37+
</actionGroup>
38+
</before>
39+
<after>
40+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
41+
<actionGroup ref="navigateToPageBuilderTemplatesGridPage" stepKey="navigateToPageBuilderTemplatesGridPage3"/>
42+
<actionGroup ref="clearFiltersPageBuilderTemplateGrid" stepKey="clearFiltersPageBuilderTemplateGrid5"/>
43+
<actionGroup ref="searchByKeywordPageBuilderTemplateGrid" stepKey="searchByKeywordPageBuilderTemplateGrid5"/>
44+
<actionGroup ref="deletePageBuilderTemplate" stepKey="deletePageBuilderTemplate"/>
45+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
46+
</after>
47+
48+
<!-- Add Row -->
49+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
50+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
51+
<argument name="contentType" value="PageBuilderRowContentType"/>
52+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
53+
</actionGroup>
54+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
55+
<argument name="contentType" value="PageBuilderRowContentType"/>
56+
</actionGroup>
57+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor">
58+
<argument name="property" value="PageBuilderBackgroundColor_Plaintext_Green"/>
59+
</actionGroup>
60+
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditPanelSettings"/>
61+
62+
<!-- Create and Save Template -->
63+
<actionGroup ref="openPageBuilderSaveTemplateModal" stepKey="openPageBuilderSaveTemplateModal"/>
64+
<actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateForm">
65+
<argument name="templateName" value="{{PageBuilderTemplateNameRandom.name}}"/>
66+
</actionGroup>
67+
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate"/>
68+
<!-- Open Apply Template -->
69+
<actionGroup ref="openPageBuilderApplyTemplateSlideOut" stepKey="openPageBuilderApplyTemplateSlideOut1"/>
70+
<actionGroup ref="clearFiltersPageBuilderTemplateGrid" stepKey="clearFiltersPageBuilderTemplateGrid1">
71+
<argument name="section" value="PageBuilderApplyTemplatesGrid"/>
72+
</actionGroup>
73+
<actionGroup ref="searchByKeywordPageBuilderTemplateGrid" stepKey="searchByKeywordPageBuilderTemplateGrid1">
74+
<argument name="section" value="PageBuilderApplyTemplatesGrid"/>
75+
<argument name="keyword" value="{{PageBuilderTemplateNameRandom.name}}"/>
76+
</actionGroup>
77+
<!-- Validate Template in Apply Template Slide Out -->
78+
<actionGroup ref="openPageBuilderTemplatePreviewImageModal" stepKey="openPageBuilderTemplatePreviewImageModal1">
79+
<argument name="templateName" value="{{PageBuilderTemplateNameRandom.name}}"/>
80+
<argument name="section" value="PageBuilderApplyTemplatesGrid"/>
81+
</actionGroup>
82+
<actionGroup ref="validatePageBuilderTemplatePreviewImageModal" stepKey="validatePageBuilderTemplatePreviewImageModal1">
83+
<argument name="templateName" value="{{PageBuilderTemplateNameRandom.name}}"/>
84+
</actionGroup>
85+
<actionGroup ref="closePageBuilderTemplatePreviewImageModal" stepKey="closePageBuilderTemplatePreviewImageModal1">
86+
<argument name="section" value="PageBuilderApplyTemplatesGrid"/>
87+
</actionGroup>
88+
<actionGroup ref="closePageBuilderApplyTemplateSlideOut" stepKey="closePageBuilderApplyTemplateSlideOut1"/>
89+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
90+
<!-- Navigate to Templates Grid Page -->
91+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToTemplatesGridPage">
92+
<argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
93+
<argument name="submenuUiId" value="{{AdminMenuContentElementsTemplates.dataUiId}}"/>
94+
</actionGroup>
95+
<actionGroup ref="NavigateToPageBuilderTemplatesGridPageWithSecretKeyEnabledActionGroup" stepKey="navigateToPageBuilderTemplatesGridPage1"/>
96+
<actionGroup ref="clearFiltersPageBuilderTemplateGrid" stepKey="clearFiltersPageBuilderTemplateGrid2"/>
97+
<actionGroup ref="searchByKeywordPageBuilderTemplateGrid" stepKey="searchByKeywordPageBuilderTemplateGrid2">
98+
<argument name="keyword" value="{{PageBuilderTemplateNameRandom.name}}"/>
99+
</actionGroup>
100+
<!-- Validate Templates Grid Page -->
101+
<actionGroup ref="openPageBuilderTemplatePreviewImageModal" stepKey="openPageBuilderTemplatePreviewImageModal2">
102+
<argument name="templateName" value="{{PageBuilderTemplateNameRandom.name}}"/>
103+
</actionGroup>
104+
<actionGroup ref="validatePageBuilderTemplatePreviewImageModal" stepKey="validatePageBuilderTemplatePreviewImageModal2">
105+
<argument name="templateName" value="{{PageBuilderTemplateNameRandom.name}}"/>
106+
</actionGroup>
107+
<actionGroup ref="closePageBuilderTemplatePreviewImageModal" stepKey="closePageBuilderTemplatePreviewImageModal2"/>
108+
109+
<!-- Disable Secret Key -->
110+
<magentoCLI command="config:set admin/security/use_form_key 0" stepKey="disableUrlSecretKeys"/>
111+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches2">
112+
<argument name="tags" value="config full_page"/>
113+
</actionGroup>
114+
<reloadPage stepKey="reloadPage2"/>
115+
116+
<!-- Navigate to CMS Page -->
117+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage2">
118+
<argument name="CMSPage" value="$$createCMSPage$$"/>
119+
</actionGroup>
120+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
121+
<!-- Open Apply Template -->
122+
<actionGroup ref="openPageBuilderApplyTemplateSlideOut" stepKey="openPageBuilderApplyTemplateSlideOut2"/>
123+
<actionGroup ref="clearFiltersPageBuilderTemplateGrid" stepKey="clearFiltersPageBuilderTemplateGrid3">
124+
<argument name="section" value="PageBuilderApplyTemplatesGrid"/>
125+
</actionGroup>
126+
<actionGroup ref="searchByKeywordPageBuilderTemplateGrid" stepKey="searchByKeywordPageBuilderTemplateGrid3">
127+
<argument name="section" value="PageBuilderApplyTemplatesGrid"/>
128+
<argument name="keyword" value="{{PageBuilderTemplateNameRandom.name}}"/>
129+
</actionGroup>
130+
<!-- Validate Template in Apply Template Slide Out -->
131+
<actionGroup ref="openPageBuilderTemplatePreviewImageModal" stepKey="openPageBuilderTemplatePreviewImageModal3">
132+
<argument name="templateName" value="{{PageBuilderTemplateNameRandom.name}}"/>
133+
<argument name="section" value="PageBuilderApplyTemplatesGrid"/>
134+
</actionGroup>
135+
<actionGroup ref="validatePageBuilderTemplatePreviewImageModal" stepKey="validatePageBuilderTemplatePreviewImageModal3">
136+
<argument name="templateName" value="{{PageBuilderTemplateNameRandom.name}}"/>
137+
</actionGroup>
138+
<actionGroup ref="closePageBuilderTemplatePreviewImageModal" stepKey="closePageBuilderTemplatePreviewImageModal3">
139+
<argument name="section" value="PageBuilderApplyTemplatesGrid"/>
140+
</actionGroup>
141+
<actionGroup ref="closePageBuilderApplyTemplateSlideOut" stepKey="closePageBuilderApplyTemplateSlideOut2"/>
142+
<!-- Navigate to Templates Grid Page -->
143+
<actionGroup ref="navigateToPageBuilderTemplatesGridPage" stepKey="navigateToPageBuilderTemplatesGridPage2"/>
144+
<actionGroup ref="clearFiltersPageBuilderTemplateGrid" stepKey="clearFiltersPageBuilderTemplateGrid4"/>
145+
<actionGroup ref="searchByKeywordPageBuilderTemplateGrid" stepKey="searchByKeywordPageBuilderTemplateGrid4">
146+
<argument name="keyword" value="{{PageBuilderTemplateNameRandom.name}}"/>
147+
</actionGroup>
148+
<!-- Validate Templates Grid Page -->
149+
<actionGroup ref="openPageBuilderTemplatePreviewImageModal" stepKey="openPageBuilderTemplatePreviewImageModal4">
150+
<argument name="templateName" value="{{PageBuilderTemplateNameRandom.name}}"/>
151+
</actionGroup>
152+
<actionGroup ref="validatePageBuilderTemplatePreviewImageModal" stepKey="validatePageBuilderTemplatePreviewImageModal4">
153+
<argument name="templateName" value="{{PageBuilderTemplateNameRandom.name}}"/>
154+
</actionGroup>
155+
<actionGroup ref="closePageBuilderTemplatePreviewImageModal" stepKey="closePageBuilderTemplatePreviewImageModal4"/>
156+
</test>
157+
</tests>

0 commit comments

Comments
 (0)