Skip to content

Commit 250f2f7

Browse files
kieuphan2406kieuphan2406
committed
MC-1364: Automate MFTF for MC-1364
Added tests to verify directive link on Category on Storefront
1 parent dbbdefc commit 250f2f7

File tree

3 files changed

+110
-3
lines changed

3 files changed

+110
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<click selector="{{moveToCE.SelectPageButton}}" stepKey="clickSelectPage"/>
7373
<waitForLoadingMaskToDisappear stepKey="waitForSelectPageModal"/>
7474
<waitForElementVisible selector="{{moveToCE.generalFilter('chooser_title')}}" stepKey="waitForGrid"/>
75-
<fillField selector="{{moveToCE.generalFilter('chooser_title')}}" userInput="{{page}}" stepKey="enterPageName"/>
75+
<fillField selector="{{moveToCE.generalFilter('chooser_identifier')}}" userInput="{{page}}" stepKey="enterPageName"/>
7676
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickSearch"/>
7777
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
7878
<waitForElementVisible selector="//td[contains(@class,'col-url')][contains(text(),'{{page}}')]" stepKey="waitForSearchResult"/>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
<data key="editPanelValue">Base URL</data>
3737
<data key="stageValue">{{config path=&quot;web/unsecure/base_url&quot;}}</data>
3838
</entity>
39+
<entity name="TinyMCEVariableCountry" type="pagebuilder_text_variable_property">
40+
<data key="variableName">default:general/store_information/country_id</data>
41+
<data key="editPanelValue">Country</data>
42+
<data key="stageValue">{{config path=&quot;general/store_information/country_id&quot;}}</data>
43+
</entity>
3944
<entity name="PageBuilderTextArea_VariableBaseURL" type="pagebuilder_text_variable_property">
4045
<data key="variableName">default:web/unsecure/base_url</data>
4146
<data key="editPanelValue">{{config path="web/unsecure/base_url"}}</data>

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

Lines changed: 104 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@
12781278
<test name="AdminPageBuilderProductDirectivesTest">
12791279
<annotations>
12801280
<features value="PageBuilder"/>
1281-
<stories value="Always Render Magento directives on Magento Storefront"/>
1281+
<stories value="Always Render Magento directives on Magento Storefront for Product"/>
12821282
<title value="Always Render Magento directives on Magento Storefront for Product"/>
12831283
<description value="Admin are able to add CMS Page link and image into PageBuilder content and see it Product Page"/>
12841284
<severity value="CRITICAL"/>
@@ -1288,12 +1288,14 @@
12881288
<group value="pagebuilder-urlInput"/>
12891289
</annotations>
12901290
<before>
1291+
<magentoCLI command="config:set general/store_information/country_id US" stepKey="setDefaultGridSize"/>
12911292
<createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
12921293
<createData entity="_newDefaultProduct" stepKey="createPreReqProduct">
12931294
<requiredEntity createDataKey="createPreReqCategory"/>
12941295
</createData>
1295-
<createData entity="_newDefaultCmsPage" stepKey="createCMSPageA" />
1296+
<createData entity="simpleCmsPage" stepKey="createCMSPageA" />
12961297
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1298+
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
12971299
</before>
12981300
<after>
12991301
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory" />
@@ -1330,6 +1332,21 @@
13301332
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
13311333
</actionGroup>
13321334
<waitForElementVisible selector="{{ImageOnStage.imageSourceByIndex('1', PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeImage1SourceOnStage"/>
1335+
1336+
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
1337+
<argument name="contentType" value="PageBuilderTextContentType"/>
1338+
</actionGroup>
1339+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
1340+
<argument name="contentType" value="PageBuilderTextContentType"/>
1341+
</actionGroup>
1342+
<actionGroup ref="addVariableToTinyMCE" stepKey="addVariableToTinyMCE">
1343+
<argument name="variable" value="TinyMCEVariableCountry"/>
1344+
</actionGroup>
1345+
<actionGroup ref="addPageLinkWidgetToTinyMCE" stepKey="addPageLinkWidgetToTinyMCE">
1346+
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
1347+
<argument name="page" value="$$createCMSPageA.identifier$$"/>
1348+
</actionGroup>
1349+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
13331350
<waitForElementVisible time="5" selector="{{PageBuilderStage.exitFullScreen}}" stepKey="waitForExitFullScreen" />
13341351
<click selector="{{PageBuilderStage.exitFullScreen}}" stepKey="exitPageBuilderFullScreen" />
13351352
<actionGroup ref="saveProductForm" stepKey="saveProduct"/>
@@ -1338,6 +1355,91 @@
13381355
<!--Go to storefront to verify Product Link-->
13391356
<waitForPageLoad stepKey="waitForPageLoad5"/>
13401357
<scrollTo selector="{{StorefrontProductInfoDetailsSection.detailsTab}}" stepKey="scrollToDetailsTab"/>
1358+
<see userInput="US" stepKey="verifyCountryVariableName" />
1359+
<see userInput="$$createCMSPageA.title$$" stepKey="verifyWidget" />
1360+
<waitForElementVisible selector="{{ImageOnStorefront.imageSourceByIndex('1', PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeImage2SourceOnStorefront"/>
1361+
<actionGroup ref="verifyCmsPageLinkOnFrontend" stepKey="checkButtonOnStoreFront">
1362+
<argument name="identifier" value="$$createCMSPageA.identifier$$"/>
1363+
</actionGroup>
1364+
<see userInput="$$createCMSPageA.title$$" stepKey="seePageName" />
1365+
</test>
1366+
<test name="AdminPageBuilderCategoryDirectivesTest">
1367+
<annotations>
1368+
<features value="PageBuilder"/>
1369+
<stories value="Always Render Magento directives on Magento Storefront for Category"/>
1370+
<title value="Always Render Magento directives on Magento Storefront for Category"/>
1371+
<description value="Admin are able to add CMS Page link and image into PageBuilder content and see it Category Page"/>
1372+
<severity value="CRITICAL"/>
1373+
<useCaseId value="MC-1364"/>
1374+
<group value="pagebuilder"/>
1375+
<group value="pagebuilder-common"/>
1376+
<group value="pagebuilder-urlInput"/>
1377+
</annotations>
1378+
<before>
1379+
<magentoCLI command="config:set general/store_information/country_id US" stepKey="setDefaultGridSize"/>
1380+
<createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
1381+
<createData entity="simpleCmsPage" stepKey="createCMSPageA" />
1382+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1383+
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
1384+
</before>
1385+
<after>
1386+
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory" />
1387+
<deleteData createDataKey="createCMSPageA" stepKey="deletePreReqCmsPage" />
1388+
<actionGroup ref="logout" stepKey="logout"/>
1389+
<waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
1390+
</after>
1391+
<!--Go to Category Page-->
1392+
<amOnPage url="{{AdminCategoryEditPage.url($$createPreReqCategory.id$$)}}" stepKey="goToCategoryEditPage"/>
1393+
<waitForPageLoad stepKey="waitForProductPageBeLoaded"/>
1394+
<click selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="clickContentTab"/>
1395+
<waitForElementVisible selector="{{PageBuilderCatalog.openPageBuilder}}" stepKey="waitForPageBuilderBtn" />
1396+
<see userInput="Edit with Page Builder" stepKey="seePageBuilderBtn"/>
1397+
<click selector="{{PageBuilderCatalog.openPageBuilder}}" stepKey="clickOnPageBuilderBtn" />
1398+
<!--See PageBuilder fullsize-->
1399+
<waitForElementVisible selector="{{PageBuilderPanel.generalGroup}}" stepKey="waiForPageBuilderVisible" />
1400+
<seeElement selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="seePageBuilderFullSizeScreen" />
1401+
<dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(PageBuilderButtonsContentType.name)}}" selector2="{{PageBuilderStage.dropAreaInStage}}" stepKey="dropContentTypeIntoStage"/>
1402+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage1">
1403+
<argument name="section" value="ButtonItemOnStage"/>
1404+
<argument name="targetIndex" value="1"/>
1405+
</actionGroup>
1406+
<!--Choose cms page link type-->
1407+
<actionGroup ref="fillOutUrlInput" stepKey="choosePageLink">
1408+
<argument name="searchResult" value="$$createCMSPageA.title$$"/>
1409+
</actionGroup>
1410+
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditPanelSettings1"/>
1411+
<click selector="{{PageBuilderPanel.mediaGroup}}" stepKey="clickMediaGroup"/>
1412+
<actionGroup ref="dragContentTypeToStage" stepKey="dragImageIntoStage">
1413+
<argument name="contentType" value="PageBuilderImageContentType"/>
1414+
</actionGroup>
1415+
<actionGroup ref="addImageToStage" stepKey="addImageToStage">
1416+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
1417+
</actionGroup>
1418+
<waitForElementVisible selector="{{ImageOnStage.imageSourceByIndex('1', PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeImage1SourceOnStage"/>
1419+
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
1420+
<argument name="contentType" value="PageBuilderTextContentType"/>
1421+
</actionGroup>
1422+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
1423+
<argument name="contentType" value="PageBuilderTextContentType"/>
1424+
</actionGroup>
1425+
<actionGroup ref="addVariableToTinyMCE" stepKey="addVariableToTinyMCE">
1426+
<argument name="variable" value="TinyMCEVariableCountry"/>
1427+
</actionGroup>
1428+
<actionGroup ref="addPageLinkWidgetToTinyMCE" stepKey="addPageLinkWidgetToTinyMCE">
1429+
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
1430+
<argument name="page" value="$$createCMSPageA.identifier$$"/>
1431+
</actionGroup>
1432+
<click selector="{{EditPanelForm.editFormSave}}" stepKey="clickSaveColumn"/>
1433+
<waitForElementNotVisible time="5" selector="{{EditPanelForm.editForm}}" stepKey="waitForEditFormNotVisible" />
1434+
<waitForElementVisible time="5" selector="{{PageBuilderStage.exitFullScreen}}" stepKey="waitForExitFullScreen" />
1435+
<click selector="{{PageBuilderStage.exitFullScreen}}" stepKey="exitPageBuilderFullScreen" />
1436+
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
1437+
<waitForPageLoad stepKey="waitForPageLoad2" />
1438+
<comment userInput="Verify directives on category store front" stepKey="commentVerifyDirectivesOnStorefront"/>
1439+
<amOnPage url="$$createPreReqCategory.name$$.html" stepKey="navigateToProductPage"/>
1440+
<waitForPageLoad stepKey="waitForPageLoad3" />
1441+
<see userInput="US" stepKey="verifyCountryVariableName" />
1442+
<see userInput="$$createCMSPageA.title$$" stepKey="verifyWidget" />
13411443
<waitForElementVisible selector="{{ImageOnStorefront.imageSourceByIndex('1', PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeImage2SourceOnStorefront"/>
13421444
<actionGroup ref="verifyCmsPageLinkOnFrontend" stepKey="checkButtonOnStoreFront">
13431445
<argument name="identifier" value="$$createCMSPageA.identifier$$"/>

0 commit comments

Comments
 (0)