Skip to content

Commit eebb652

Browse files
anthoulaanthoula
committed
MC-17823: Access Images/Widgets/Variable from HTML content type
- update new test
1 parent 1437135 commit eebb652

File tree

3 files changed

+47
-27
lines changed

3 files changed

+47
-27
lines changed

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,34 @@
1313
<argument name="widget" defaultValue=""/>
1414
<argument name="page" defaultValue="" type="string"/>
1515
</arguments>
16-
<comment userInput="Adding Widget To Textarea" stepKey="commentAddWidget"/>
16+
<comment userInput="addPageLinkWidgetToHtmlCodeWYSIWYGDisabled" stepKey="commentAddWidget"/>
1717
<waitForElementVisible selector="{{HtmlOnConfiguration.insertWidgetButton}}" stepKey="waitForInsertWidget1"/>
1818
<click selector="{{HtmlOnConfiguration.insertWidgetButton}}" stepKey="clickAddWidgetBtn"/>
1919
<waitForElementVisible selector="{{HtmlOnConfiguration.textarea}}" stepKey="waitForInsertWidgetModalToClose"/>
20-
<executeJS function="return document.querySelectorAll('{{HtmlOnConfiguration.textareaCSS}}')[0].value;" stepKey="getText"/>
21-
<assertContains actual="getText" actualType="variable" expected="{{widget.editPanelValue}}" expectedType="string" stepKey="assertValue"/>
20+
<executeJS function="return document.querySelectorAll('{{HtmlOnConfiguration.textareaCSS}}')[0].value;" stepKey="getValueFromTextarea" after="waitForInsertWidgetModalToClose"/>
21+
<assertContains stepKey="assertTextareaContainsValue" after="getValueFromTextarea">
22+
<expectedResult type="string">{{widget.editPanelValue}}</expectedResult>
23+
<actualResult type="variable">getValueFromTextarea</actualResult>
24+
</assertContains>
2225
</actionGroup>
23-
<actionGroup name="addPageLinkVariableToHtmlCodeWYSIWYGDisabled">
26+
<actionGroup name="addVariableToHtmlCodeWYSIWYGDisabled">
2427
<arguments>
2528
<argument name="variable" defaultValue=""/>
2629
</arguments>
30+
<comment userInput="addVariableToHtmlCodeWYSIWYGDisabled" stepKey="commentAddVariableToHtmlCodeWYSIWYGDisabled"/>
2731
<waitForElementVisible selector="{{HtmlOnConfiguration.insertVariableButton}}" stepKey="waitForInsertVariable1"/>
2832
<click selector="{{HtmlOnConfiguration.insertVariableButton}}" stepKey="clickInsertVariable1"/>
29-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
33+
<waitForPageLoad stepKey="waitForPageLoad"/>
3034
<waitForElementVisible selector="{{VariableSection.Radio(variable.variableName)}}" stepKey="waitForVariable1"/>
3135
<checkOption selector="{{VariableSection.Radio(variable.variableName)}}" stepKey="selectVariable"/>
3236
<waitForElementVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForInsertVariable2"/>
3337
<click selector="{{VariableSection.InsertWidget}}" stepKey="clickInsertVariable2"/>
3438
<waitForElementNotVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForVariableModalToClose"/>
3539
<waitForElementVisible selector="{{HtmlOnConfiguration.textarea}}" stepKey="waitForTextArea"/>
36-
<executeJS function="return document.querySelectorAll('{{HtmlOnConfiguration.textareaCSS}}')[0].value;" stepKey="getText"/>
37-
<assertContains actual="getText" actualType="variable" expected="{{variable.editPanelValue}}" expectedType="string" stepKey="assertValue"/>
40+
<executeJS function="return document.querySelectorAll('{{HtmlOnConfiguration.textareaCSS}}')[0].value;" stepKey="getValueFromTextarea"/>
41+
<assertContains stepKey="assertTextareaContainsValue">
42+
<expectedResult type="string">{{variable.editPanelValue}}</expectedResult>
43+
<actualResult type="variable">getValueFromTextarea</actualResult>
44+
</assertContains>
3845
</actionGroup>
3946
</actionGroups>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,4 +225,13 @@
225225
<waitForPageLoad stepKey="waitForPageLoad1"/>
226226
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
227227
</actionGroup>
228+
<actionGroup name="clickButton">
229+
<arguments>
230+
<argument name="button" type="string"/>
231+
</arguments>
232+
<comment userInput="clickButton" stepKey="commentClickButton"/>
233+
<waitForElementVisible selector="{{button}}" stepKey="waitForInsertImage"/>
234+
<click selector="{{button}}" stepKey="clickInsertImage"/>
235+
<waitForPageLoad stepKey="waitForPageLoad"/>
236+
</actionGroup>
228237
</actionGroups>

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

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,10 @@
5757
<argument name="widget" value="PageBuilderTextArea_WidgetCMSPageLink"/>
5858
<argument name="page" value="html-code{{PageBuilderPageTitle.pageName}}"/>
5959
</actionGroup>
60-
<waitForElementVisible selector="{{HtmlOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
61-
<click selector="{{HtmlOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
62-
<waitForPageLoad stepKey="waitForPageLoad"/>
63-
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
64-
<waitForPageLoad stepKey="waitForPageLoad2"/>
60+
<actionGroup ref="clickButton" stepKey="clickInsertImageInHtmlCode">
61+
<argument name="button" value="{{HtmlOnConfiguration.insertImageButton}}"/>
62+
</actionGroup>
63+
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
6564
<actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
6665
<argument name="ImageFolder" value="ImageFolder"/>
6766
</actionGroup>
@@ -73,45 +72,45 @@
7372
<argument name="value" value="{{ImageUpload3.value}}"/>
7473
<argument name="selector" value="{{HtmlOnConfiguration.textarea}}"/>
7574
</actionGroup>
76-
<actionGroup ref="addPageLinkVariableToHtmlCodeWYSIWYGDisabled" stepKey="addPageLinkVariableToHtmlCodeWYSIWYGDisabled">
75+
<actionGroup ref="addVariableToHtmlCodeWYSIWYGDisabled" stepKey="addVariableToHtmlCodeWYSIWYGDisabled">
7776
<argument name="variable" value="PageBuilderTextArea_VariableBaseURL"/>
7877
</actionGroup>
7978
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
8079
<!-- Validate Stage -->
8180
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
8281
<waitForElementVisible selector="{{HtmlOnStage.base('1')}}" stepKey="waitForHtmlBaseStage1"/>
8382
<waitForElementVisible selector="{{HtmlOnStage.html('1', PageBuilderHtmlPropertyButton.selector)}}" stepKey="waitForHtmlStage1"/>
84-
<executeJS function="return document.querySelectorAll('{{HtmlOnStage.baseCSS}}')[0].innerText;" stepKey="actualData"/>
85-
<assertContains stepKey="assertWidget">
83+
<executeJS function="return document.querySelectorAll('{{HtmlOnStage.baseCSS}}')[0].innerText;" stepKey="actualTextFromHtmlCode"/>
84+
<assertContains stepKey="assertWidgetOnStage">
8685
<expectedResult type="string">{{TinyMCEWidgetCMSPageLink.stageValue}}</expectedResult>
87-
<actualResult type="variable">actualData</actualResult>
86+
<actualResult type="variable">actualTextFromHtmlCode</actualResult>
8887
</assertContains>
89-
<assertContains stepKey="assertImage">
88+
<assertContains stepKey="assertImageOnStage">
9089
<expectedResult type="string">{{ImageUpload3.value}}</expectedResult>
91-
<actualResult type="variable">actualData</actualResult>
90+
<actualResult type="variable">actualTextFromHtmlCode</actualResult>
9291
</assertContains>
93-
<assertContains stepKey="assertVariable">
92+
<assertContains stepKey="assertVariableOnStage">
9493
<expectedResult type="string">{{TinyMCEVariableBaseURL.stageValue}}</expectedResult>
95-
<actualResult type="variable">actualData</actualResult>
94+
<actualResult type="variable">actualTextFromHtmlCode</actualResult>
9695
</assertContains>
9796
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
9897
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
9998
<!-- Validate Stage After Save -->
10099
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
101100
<waitForElementVisible selector="{{HtmlOnStage.base('1')}}" stepKey="waitForHtmlBaseStage2"/>
102101
<waitForElementVisible selector="{{HtmlOnStage.html('1', PageBuilderHtmlPropertyButton.selector)}}" stepKey="waitForHtmlStage2"/>
103-
<executeJS function="return document.querySelectorAll('{{HtmlOnStage.baseCSS}}')[0].innerText;" stepKey="actualDataAfterSave"/>
104-
<assertContains stepKey="assertWidgetAfterSave">
102+
<executeJS function="return document.querySelectorAll('{{HtmlOnStage.baseCSS}}')[0].innerText;" stepKey="actualTextFromHtmlCodeAfterSave"/>
103+
<assertContains stepKey="assertWidgetOnStageAfterSave">
105104
<expectedResult type="string">{{TinyMCEWidgetCMSPageLink.stageValue}}</expectedResult>
106-
<actualResult type="variable">actualDataAfterSave</actualResult>
105+
<actualResult type="variable">actualTextFromHtmlCodeAfterSave</actualResult>
107106
</assertContains>
108-
<assertContains stepKey="assertImageAfterSave">
107+
<assertContains stepKey="assertImageOnStageAfterSave">
109108
<expectedResult type="string">{{ImageUpload3.value}}</expectedResult>
110-
<actualResult type="variable">actualDataAfterSave</actualResult>
109+
<actualResult type="variable">actualTextFromHtmlCodeAfterSave</actualResult>
111110
</assertContains>
112-
<assertContains stepKey="assertVariableAfterSave">
111+
<assertContains stepKey="assertVariableOnStageAfterSave">
113112
<expectedResult type="string">{{PageBuilderTextArea_VariableBaseURL.editPanelValue}}</expectedResult>
114-
<actualResult type="variable">actualDataAfterSave</actualResult>
113+
<actualResult type="variable">actualTextFromHtmlCodeAfterSave</actualResult>
115114
</assertContains>
116115
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
117116
<argument name="contentType" value="PageBuilderHtmlContentType"/>
@@ -148,6 +147,11 @@
148147
<expectedResult type="string">{{_ENV.MAGENTO_BASE_URL}}</expectedResult>
149148
<actualResult type="variable">actualTextStorefront</actualResult>
150149
</assertContains>
150+
<!-- Click Page Link Widget Storefront -->
151+
<comment userInput="Click Page Link Widget Storefront" stepKey="clickClickPageLinkWidgetStorefront"/>
152+
<click selector="{{HtmlOnStorefront.widgetLink('1', _ENV.MAGENTO_BASE_URL, PageBuilderPageTitle.pageName)}}" stepKey="clickWidgetStorefront"/>
153+
<waitForPageLoad stepKey="waitForPageLoad"/>
154+
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}html-code{{PageBuilderPageTitle.pageName}}" stepKey="seeThatUrlIsChangedToPageLinkWidgetUrlStorefront"/>
151155
</test>
152156
<test name="HtmlDelete">
153157
<annotations>

0 commit comments

Comments
 (0)