Skip to content

Commit 0ae19e9

Browse files
sandesh-shivakumarsandesh-shivakumar
committed
ACQE-8575: Verify the price including and excluding tax of Recently Viewed Widget
 - Fixed widget inserting issue when page builder is configured
1 parent b2e1c2e commit 0ae19e9

File tree

3 files changed

+62
-8
lines changed

3 files changed

+62
-8
lines changed

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectRecentlyViewedProductWidgetFromInsertWidgetSlideOutActionGroup.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSelectRecentlyViewedProductWidgetFromInsertWidgetSlideOutActionGroup" extends="AdminInsertRecentlyViewedWidgetActionGroup">
12+
<annotations>
13+
<description>Fills out the Widget Options form for the Recently Viewed Products widget from the Insert Widget slide out.</description>
14+
</annotations>
15+
<remove keyForRemoval="expandContentSectionIfNotVisible"/>
16+
<remove keyForRemoval="clickNextShowHideEditorIfVisible"/>
17+
<remove keyForRemoval="checkCMSContent"/>
18+
<remove keyForRemoval="clickNextSave"/>
19+
<remove keyForRemoval="waitForPageActionSave"/>
20+
<remove keyForRemoval="waitForSaveSuccess"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,10 @@
119119
<data key="identifier" unique="suffix" >block</data>
120120
<data key="active">true</data>
121121
</entity>
122+
<entity name="PageBuilderHtmlCmsHomePageContent" type="pagebuilder_html_property">
123+
<data key="name">HTML</data>
124+
<data key="section">general</data>
125+
<data key="value">CMS homepage content goes here</data>
126+
<data key="fieldName">html</data>
127+
</entity>
122128
</entities>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontVerifyRecentlyViewedWidgetTaxPricesTest.xml‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright 2024 Adobe
4+
* Copyright 2025 Adobe
55
* All Rights Reserved.
66
*/
77
-->
@@ -85,34 +85,60 @@
8585
</actionGroup>
8686
<deleteData createDataKey="createUSAllTaxRate20" stepKey="deleteTaxRate"/>
8787
<deleteData createDataKey="category" stepKey="deleteCategory"/>
88-
<actionGroup ref="AdminEditCMSPageContentActionGroup" stepKey="clearRecentlyViewedWidgetsFromCMSContent">
89-
<argument name="content" value="{{CmsHomePageContent.content}}"/>
90-
<argument name="pageId" value="{{CmsHomePageContent.page_id}}"/>
88+
<actionGroup ref="AdminOpenCmsPageActionGroup" stepKey="navigateToEditHomePageToReset">
89+
<argument name="page_id" value="{{CmsHomePageContent.page_id}}"/>
9190
</actionGroup>
91+
<conditionalClick selector="{{CmsNewPagePageActionsSection.contentSectionName}}" dependentSelector="{{CmsNewPagePageActionsSection.showHideEditor}}" visible="false" stepKey="expandContentSectionIfNotVisibleToReset"/>
92+
<waitForPageLoad time="30" stepKey="waitForPageLoadContentSectionToReset"/>
93+
<actionGroup ref="ClickEditWithPageBuilderButtonActionGroup" stepKey="clickEditWithPageBuilderButtonActionGroupToReset"/>
94+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageToReset">
95+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
96+
</actionGroup>
97+
<actionGroup ref="fillSlideOutPanelTextArea" stepKey="clearRecentlyViewedWidgetsFromCMSContent">
98+
<argument name="property" value="PageBuilderHtmlCmsHomePageContent"/>
99+
</actionGroup>
100+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlockAfterReset"/>
101+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenAfterReset"/>
102+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterReset"/>
92103
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
93104
</after>
94105
<!-- Step 2:- Create "Recently Viewed Widget" and add it to the home page -->
95106
<actionGroup ref="AdminOpenCmsPageActionGroup" stepKey="navigateToEditHomePage">
96107
<argument name="page_id" value="{{CmsHomePageContent.page_id}}"/>
97108
</actionGroup>
98-
<actionGroup ref="AdminInsertRecentlyViewedWidgetActionGroup" stepKey="insertRecentlyViewedWidget">
109+
<conditionalClick selector="{{CmsNewPagePageActionsSection.contentSectionName}}" dependentSelector="{{CmsNewPagePageActionsSection.showHideEditor}}" visible="false" stepKey="expandContentSectionIfNotVisible"/>
110+
<waitForPageLoad time="30" stepKey="waitForPageLoadContentSection"/>
111+
<actionGroup ref="ClickEditWithPageBuilderButtonActionGroup" stepKey="clickEditWithPageBuilderButtonActionGroup"/>
112+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
113+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
114+
</actionGroup>
115+
<actionGroup ref="AdminSelectRecentlyViewedProductWidgetFromInsertWidgetSlideOutActionGroup" stepKey="insertRecentlyViewedWidget">
99116
<argument name="attributeSelector1" value="show_attributes"/>
100117
<argument name="attributeSelector2" value="show_buttons"/>
101118
<argument name="productAttributeSection1" value="1"/>
102119
<argument name="productAttributeSection2" value="4"/>
103120
<argument name="buttonToShowSection2" value="3"/>
104121
</actionGroup>
122+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock"/>
123+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
124+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
105125
<!-- Step 3:- Create "Catalog Product List Widget" and add it to the home page (for comparison), limit the visible SKU to created bundle product sku -->
106-
<conditionalClick selector="{{CmsNewPagePageActionsSection.contentSectionName}}" dependentSelector="{{CmsNewPagePageActionsSection.showHideEditor}}" visible="false" stepKey="expandContentSectionIfNotVisible"/>
107-
<waitForPageLoad time="30" stepKey="waitForPageLoadContentSection"/>
108-
<conditionalClick selector="{{CmsNewPagePageActionsSection.showHideEditor}}" dependentSelector="{{CatalogWidgetSection.insertWidgetButton}}" visible="false" stepKey="clickNextShowHideEditorIfVisible"/>
126+
<conditionalClick selector="{{CmsNewPagePageActionsSection.contentSectionName}}" dependentSelector="{{CmsNewPagePageActionsSection.showHideEditor}}" visible="false" stepKey="expandContentSectionIfNotVisibleAgain"/>
127+
<waitForPageLoad time="30" stepKey="waitForPageLoadContentSectionAgain"/>
128+
<actionGroup ref="ClickEditWithPageBuilderButtonActionGroup" stepKey="clickEditWithPageBuilderButtonActionGroupAgain"/>
129+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageAgain">
130+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
131+
</actionGroup>
109132
<actionGroup ref="AdminInsertWidgetToCmsPageContentActionGroup" stepKey="insertCatalogProductsListWidget">
110133
<argument name="widgetType" value="Catalog Products List"/>
111134
</actionGroup>
112135
<actionGroup ref="AdminFillCatalogProductsListWidgetSkuActionGroup" stepKey="addSkuCondition">
113136
<argument name="sku" value="$$createSpriteYogaStrapsBundle.sku$$"/>
114137
</actionGroup>
115138
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="insertWidget"/>
139+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlockAgain"/>
140+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenAgain"/>
141+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAgain"/>
116142
<actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="saveHomePageAfterCatalogProductListWidgetCreation"/>
117143
<!-- Step 4:- Search for "Set of Sprite Yoga Straps" product (the sample grouped product) and add to the cart -->
118144
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">

0 commit comments

Comments
 (0)