Skip to content

Commit 4c8e1f4

Browse files
tjwiebelltjwiebell
authored
Merge pull request #49 from magento-obsessive-owls/cms-team-2-sprint-7
[CMS Team 2 - Sprint 7] Text Tests
2 parents 86ac493 + 25dcd41 commit 4c8e1f4

File tree

8 files changed

+574
-6
lines changed

8 files changed

+574
-6
lines changed

‎dev/build/dev

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/ActionGroup/TextActionGroup.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,23 @@
3939
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCEVariable(variable.editPanelValue, '1')}}" stepKey="waitForVariable2"/>
4040
<switchToIFrame stepKey="exitIFrame"/>
4141
</actionGroup>
42+
<actionGroup name="addPageLinkVariableWYSIWYGDisabled">
43+
<arguments>
44+
<argument name="variable" defaultValue=""/>
45+
</arguments>
46+
<comment userInput="Adding Variable To Tiny MCE" stepKey="commentAddVariableToTinyMCE"/>
47+
<waitForElementVisible selector="{{TextOnConfiguration.insertVariableButton}}" stepKey="waitForInsertVariable1"/>
48+
<click selector="{{TextOnConfiguration.insertVariableButton}}" stepKey="clickInsertVariable1"/>
49+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
50+
<waitForElementVisible selector="{{VariableSection.Radio(variable.variableName)}}" stepKey="waitForVariable1"/>
51+
<checkOption selector="{{VariableSection.Radio(variable.variableName)}}" stepKey="selectVariable"/>
52+
<waitForElementVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForInsertVariable2"/>
53+
<click selector="{{VariableSection.InsertWidget}}" stepKey="clickInsertVariable2"/>
54+
<waitForElementNotVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForVariableModalToClose"/>
55+
<waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextArea"/>
56+
<executeJS function="return document.getElementById('{{TextOnConfiguration.textAreaId}}').value;" stepKey="getText"/>
57+
<assertContains actual="getText" actualType="variable" expected="{{variable.editPanelValue}}" expectedType="string" stepKey="assertValue"/>
58+
</actionGroup>
4259
<actionGroup name="addPageLinkWidgetToTinyMCE">
4360
<arguments>
4461
<argument name="widget" defaultValue=""/>
@@ -71,4 +88,47 @@
7188
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCEWidget(widget.editPanelValue, '1')}}" stepKey="waitForWidget"/>
7289
<switchToIFrame stepKey="exitIFrame"/>
7390
</actionGroup>
91+
<actionGroup name="addPageLinkWidgetWYSIWYGDisabled">
92+
<arguments>
93+
<argument name="widget" defaultValue=""/>
94+
<argument name="page" defaultValue="" type="string"/>
95+
</arguments>
96+
<comment userInput="Adding Widget" stepKey="commentAddWidget"/>
97+
<waitForElementVisible selector="{{TextOnConfiguration.insertWidgetButton}}" stepKey="waitForInsertWidget1"/>
98+
<click selector="{{TextOnConfiguration.insertWidgetButton}}" stepKey="clickInsertWidget1"/>
99+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
100+
<waitForElementVisible selector="{{WidgetSection.WidgetType}}" stepKey="waitForWidgetType"/>
101+
<selectOption selector="{{WidgetSection.WidgetType}}" userInput="{{TinyMCEWidgetCMSPageLink.widgetType}}" stepKey="selectCMSPageLinkWidget"/>
102+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
103+
<waitForElementVisible selector="{{moveToCE.SelectPageButton}}" stepKey="waitForSelectPage"/>
104+
<click selector="{{moveToCE.SelectPageButton}}" stepKey="clickSelectPage"/>
105+
<waitForLoadingMaskToDisappear stepKey="waitForSelectPageModal"/>
106+
<waitForElementVisible selector="{{moveToCE.generalFilter('chooser_title')}}" stepKey="waitForGrid"/>
107+
<fillField selector="{{moveToCE.generalFilter('chooser_title')}}" userInput="{{page}}" stepKey="enterPageName"/>
108+
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickSearch"/>
109+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
110+
<waitForElementVisible selector="//td[contains(@class,'col-url')][contains(text(),'{{page}}')]" stepKey="waitForSearchResult"/>
111+
<click selector="//td[contains(@class,'col-url')][contains(text(),'{{page}}')]" stepKey="clickCmsPageLinkRow"/>
112+
<waitForElementNotVisible selector="//td[contains(@class,'col-url')][contains(text(),'{{page}}')]" stepKey="waitForPageSelectionModalToClose"/>
113+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear4"/>
114+
<waitForPageLoad stepKey="waitForPanelSlideOut"/>
115+
<waitForElementVisible selector="{{WidgetSection.InsertWidget}}" stepKey="waitForInsertWidget2"/>
116+
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget2"/>
117+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear5"/>
118+
<waitForElementNotVisible selector="{{WidgetSection.InsertWidget}}" stepKey="waitForInsertWidgetModalToClose"/>
119+
<waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextArea"/>
120+
<executeJS function="return document.getElementById('{{TextOnConfiguration.textAreaId}}').value;" stepKey="getText"/>
121+
<assertContains actual="getText" actualType="variable" expected="{{widget.editPanelValue}}" expectedType="string" stepKey="assertValue"/>
122+
</actionGroup>
123+
<actionGroup name="validateTextInTinyMCE">
124+
<arguments>
125+
<argument name="property" defaultValue=""/>
126+
<argument name="section" defaultValue="TextOnConfiguration"/>
127+
</arguments>
128+
<comment userInput="Validating Text In Tiny MCE" stepKey="commentValidateTextTinyMCE"/>
129+
<waitForElementVisible selector="#{{section.tinyMCEIFrame}}" stepKey="waitForIFrame"/>
130+
<switchToIFrame selector="{{section.tinyMCEIFrame}}" stepKey="switchToIFrame"/>
131+
<waitForElementVisible selector="{{section.textInIFrame(property.value)}}" stepKey="waitForTextVisible"/>
132+
<switchToIFrame stepKey="exitIFrame"/>
133+
</actionGroup>
74134
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Data/TextData.xml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,42 @@
1212
<entity name="PageBuilderTextContentBlock" type="pagebuilder_text_property">
1313
<data key="name">Text</data>
1414
<data key="section">General</data>
15-
<data key="role">textarea</data>
15+
<data key="fieldName">textarea</data>
1616
<data key="cmsPageLinkName" unique="suffix">cms-page-link-</data>
1717
<data key="value">test string</data>
1818
</entity>
1919
<entity name="PageBuilderTextContentBlockDefault" type="pagebuilder_text_property">
2020
<data key="name">Text</data>
2121
<data key="section">General</data>
22-
<data key="role">textarea</data>
22+
<data key="fieldName">textarea</data>
2323
<data key="cmsPageLinkName" unique="suffix">cms-page-link-</data>
2424
<data key="value">Text</data>
2525
</entity>
26+
<entity name="PageBuilderTextContentBlockEmpty" type="pagebuilder_text_property">
27+
<data key="name">Text</data>
28+
<data key="section">General</data>
29+
<data key="fieldName">textarea</data>
30+
<data key="cmsPageLinkName" unique="suffix">cms-page-link-</data>
31+
<data key="value"/>
32+
</entity>
2633
<!-- Variables -->
2734
<entity name="TinyMCEVariableBaseURL" type="pagebuilder_text_variable_property">
2835
<data key="variableName">default:web/unsecure/base_url</data>
2936
<data key="editPanelValue">Base URL</data>
3037
<data key="stageValue">{{config path=&quot;web/unsecure/base_url&quot;}}</data>
3138
</entity>
39+
<entity name="PageBuilderTextArea_VariableBaseURL" type="pagebuilder_text_variable_property">
40+
<data key="variableName">default:web/unsecure/base_url</data>
41+
<data key="editPanelValue">{{config path="web/unsecure/base_url"}}</data>
42+
</entity>
3243
<!-- Widgets -->
3344
<entity name="TinyMCEWidgetCMSPageLink" type="pagebuilder_text_widget_property">
3445
<data key="widgetType">Magento\Cms\Block\Widget\Page\Link</data>
3546
<data key="editPanelValue">CMS Page Link</data>
3647
<data key="stageValue">{{widget type=&quot;Magento\\Cms\\Block\\Widget\\Page\\Link&quot; template=&quot;widget/link/link_block.phtml&quot; page_id=</data>
3748
</entity>
49+
<entity name="PageBuilderTextArea_WidgetCMSPageLink" type="pagebuilder_text_widget_property">
50+
<data key="widgetType">Magento\Cms\Block\Widget\Page\Link</data>
51+
<data key="editPanelValue">{{widget type=&quot;Magento\\Cms\\Block\\Widget\\Page\\Link&quot; template=&quot;widget/link/link_block.phtml&quot; page_id=</data>
52+
</entity>
3853
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Section/PageBuilderTextSection.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1010
<section name="TextOnStage">
1111
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}]" parameterized="true"/>
12+
<element name="textAreaText" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][.='{{arg2}}']" parameterized="true"/>
13+
<element name="textAreaTextContains" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(.,'{{arg2}}')]" parameterized="true"/>
1214
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//p[contains(.,'{{arg2}}')]" parameterized="true"/>
1315
<!-- Advanced Configuration -->
1416
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
@@ -29,14 +31,23 @@
2931
<element name="noPadding" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'padding:'))]" parameterized="true"/>
3032
</section>
3133
<section name="TextOnConfiguration">
32-
<element name="textArea" type="text" selector="#pagebuilder_text_form_content"/>
34+
<!-- WYSIWYG Enabled -->
3335
<element name="tinyMCEIFrame" type="text" selector="pagebuilder_text_form_content_ifr"/>
3436
<element name="textInIFrame" type="text" selector="//body//p[.='{{arg1}}']" parameterized="true"/>
3537
<element name="tinyMCEVariable" type="text" selector="(//body//span[contains(@class,'magento-variable') and .='{{arg1}}'])[{{arg2}}]" parameterized="true"/>
3638
<element name="tinyMCEWidget" type="text" selector="(//body//span[contains(@class,'magento-widget') and .='{{arg1}}'])[{{arg2}}]" parameterized="true"/>
39+
<!-- WYSIWYG Disabled -->
40+
<element name="textArea" type="text" selector="#pagebuilder_text_form_content"/>
41+
<element name="textAreaId" type="text" selector="pagebuilder_text_form_content"/>
42+
<element name="insertWidgetButton" type="text" selector="//button[contains(@class,'action-add-widget')][.='Insert Widget...']"/>
43+
<element name="insertImageButton" type="text" selector="//button[contains(@class,'action-add-image')][.='Insert Image...']"/>
44+
<element name="insertVariableButton" type="text" selector="//button[contains(@class,'add-variable')][.='Insert Variable...']"/>
3745
</section>
3846
<section name="TextOnStorefront">
3947
<element name="base" type="text" selector="(//div[@data-role='text'])[{{arg1}}]" parameterized="true"/>
48+
<element name="textAreaText" type="text" selector="(//div[@data-role='text'])[{{arg1}}][.='{{arg2}}']" parameterized="true"/>
49+
<element name="textAreaWidget" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
50+
<element name="textAreaVariable" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
4051
<element name="text" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//p[.='{{arg2}}']" parameterized="true"/>
4152
<!-- Advanced Configuration -->
4253
<element name="alignment" type="text" selector="(//div[@data-role='text'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<testCaseId value="MAGETWO-89375"/>
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
21+
<!-- Skipped: See MAGETWO-91060 -->
22+
<group value="skip"/>
2123
</annotations>
2224
<before>
2325
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

0 commit comments

Comments
 (0)