Skip to content

Commit 9c46fb7

Browse files
danmooney2danmooney2
committed
Merge remote-tracking branch 'origin/MC-1416' into MC-1416
2 parents 42b7918 + 5aff6d2 commit 9c46fb7

File tree

7 files changed

+205
-112
lines changed

7 files changed

+205
-112
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
<element name="textAreaText" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[.='{{arg2}}']" parameterized="true"/>
1313
<element name="textAreaTextContains" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[contains(.,'{{arg2}}')]" parameterized="true"/>
1414
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//p[contains(.,'{{arg2}}')]/span" parameterized="true"/>
15+
<element name="placeholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
16+
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
17+
<element name="importantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//span[text()='Important']" parameterized="true"/>
18+
<element name="textInImportantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div/div[contains(normalize-space(@class), 'cms-content-important') and text()='{{arg2}}']" parameterized="true"/>
1519
<!-- Advanced Configuration -->
1620
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
1721
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -29,8 +33,6 @@
2933
<element name="noMargins" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[not(contains(@style,'margin:'))]" parameterized="true"/>
3034
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
3135
<element name="noPadding" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[not(contains(@style,'padding:'))]" parameterized="true"/>
32-
<element name="placeholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
33-
<element name="tinymce" type="text" selector=".inline-wysiwyg"/>
3436
</section>
3537
<section name="TextOnConfiguration">
3638
<!-- WYSIWYG Enabled -->
@@ -53,6 +55,7 @@
5355
<element name="textAreaWidget" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
5456
<element name="textAreaVariable" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
5557
<element name="text" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//p[contains(text(),'{{arg2}}')]" parameterized="true"/>
58+
<element name="empty" type="text" selector="//div[@data-role='text'][{{arg1}}][not(*)]" parameterized="true"/>
5659
<!-- Advanced Configuration -->
5760
<element name="alignment" type="text" selector="(//div[@data-role='text'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
5861
<element name="noAlignment" type="text" selector="(//div[@data-role='text'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -70,7 +73,6 @@
7073
<element name="noMargins" type="text" selector="(//div[@data-role='text'])[{{arg1}}][not(contains(@style,'margin:'))]" parameterized="true"/>
7174
<element name="padding" type="text" selector="(//div[@data-role='text'])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
7275
<element name="noPadding" type="text" selector="(//div[@data-role='text'])[{{arg1}}][not(contains(@style,'padding:'))]" parameterized="true"/>
73-
<element name="empty" type="text" selector="//div[@data-role='text'][{{arg1}}][not(*)]" parameterized="true"/>
7476
</section>
7577
<section name="TextOnBackend">
7678
<element name="textInstance" type="button" selector='//div[contains(@class, "pagebuilder-text")][1]/div[1]'/>

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

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
11-
<test name="CanAddTextBLockToColumnBlock">
11+
<test name="AddWYSIWYGContentTypeToColumnOnStage">
1212
<annotations>
1313
<features value="PageBuilder"/>
1414
<stories value="Text"/>
15-
<title value="Add text content block to column"/>
16-
<description value="Verify that user are able to add Text Content Block to Column"/>
15+
<title value="Add WYSIWYG Text Content Type to Column on stage"/>
16+
<description value="Verify that user are able to interact with WYSIWYG Text Content Type to Column on stage"/>
1717
<severity value="CRITICAL"/>
18-
<useCaseId value=""/>
19-
<testCaseId value=""/>
20-
<group value="pagebuilder"/>
18+
<useCaseId value="MC-1416"/>
19+
<testCaseId value="MC-3469"/>
20+
<group value="kieu"/>
2121
<group value="pagebuilder-text"/>
2222
<group value="pagebuilder-column-content"/>
2323
</annotations>
@@ -28,42 +28,53 @@
2828
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
2929
</before>
3030
<after>
31+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
32+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
33+
<argument name="FolderName" value="{{ImageUpload3.path}}"/>
34+
</actionGroup>
35+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
36+
<argument name="Image" value="ImageUpload3"/>
37+
</actionGroup>
3138
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
3239
<deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB" />
3340
<actionGroup ref="logout" stepKey="logout"/>
3441
</after>
3542
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
3643
<argument name="CMSPage" value="$$createCMSPage$$"/>
3744
</actionGroup>
38-
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
45+
<actionGroup ref="dragContentTypeToStage" stepKey="dragThirdColumnIntoStage">
3946
<argument name="contentType" value="PageBuilderColumnContentType"/>
4047
</actionGroup>
41-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
48+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextToColumn">
4249
<argument name="contentType" value="PageBuilderTextContentType"/>
50+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
51+
<argument name="containerTargetIndex" value="1"/>
52+
<argument name="contentTypeIndex" value="1"/>
4353
</actionGroup>
4454
<!--Input text into stage-->
4555
<comment userInput="Input text into stage" stepKey="commentInputTextIntoStage"/>
46-
<executeJS function="tinymce.get(jQuery('.inline-wysiwyg').eq(0).attr('id')).insertContent('Hello World')" stepKey="addTextToWYSIWYG"/>
47-
<click selector="{{CmsNewPagePageBasicFieldsSection.contentHeading}}" stepKey="lostFocusFromWYSIWYG1"/>
56+
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
57+
<fillField selector="{{TextOnStage.tinymce('1')}}" userInput="{{PageBuilderTextContentTypeDefault.value}}" stepKey="fillTextToTinyMCE4"/>
58+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG1"/>
4859
<!--Verify inputed text on slideout-->
4960
<comment userInput="Verify inputed text on slideout" stepKey="commentVerifyTextOnSlideout"/>
5061
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
5162
<argument name="contentType" value="PageBuilderTextContentType"/>
5263
</actionGroup>
5364
<switchToIFrame selector="{{TextOnConfiguration.tinyMCEIFrame}}" stepKey="switchToIFrame1"/>
54-
<waitForElementVisible selector="{{TextOnConfiguration.textInIFrame('Hello World')}}" stepKey="waitForText"/>
65+
<waitForElementVisible selector="{{TextOnConfiguration.textInIFrame(PageBuilderTextContentTypeDefault.value)}}" stepKey="waitForText"/>
5566
<switchToIFrame stepKey="exitIFrame1"/>
5667
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings1"/>
5768
<!--Input variable into stage-->
5869
<comment userInput="Input variable into stage" stepKey="commentInputVariableIntoStage"/>
59-
<click selector="{{TextOnStage.tinymce}}" stepKey="focusOnEditorArea1"/>
70+
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea1"/>
6071
<actionGroup ref="addVariableToTinyMCE" stepKey="addVariableToTinyMCE">
6172
<argument name="variable" value="TinyMCEVariableBaseURL"/>
6273
</actionGroup>
6374
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEVariableBaseURL.editPanelValue)}}" stepKey="waitForVariableBaseURLStage"/>
6475
<!--Verify inputed variable on slideout-->
6576
<comment userInput="Verify inputed variable on slideout" stepKey="commentVerifyVariableOnSlideout"/>
66-
<click selector="{{CmsNewPagePageBasicFieldsSection.contentHeading}}" stepKey="lostFocusFromWYSIWYG2"/>
77+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG2"/>
6778
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
6879
<argument name="contentType" value="PageBuilderTextContentType"/>
6980
</actionGroup>
@@ -73,13 +84,13 @@
7384
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
7485
<!--Input widget into stage-->
7586
<comment userInput="Input widget into stage" stepKey="commentInputWidgetIntoStage"/>
76-
<click selector="{{TextOnStage.tinymce}}" stepKey="focusOnEditorArea2"/>
87+
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea2"/>
7788
<actionGroup ref="addPageLinkWidgetToTinyMCE" stepKey="addPageLinkWidgetToTinyMCE">
7889
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
7990
<argument name="page" value="$$createCMSPageB.identifier$$"/>
8091
</actionGroup>
8192
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="waitForWidgetStage"/>
82-
<click selector="{{CmsNewPagePageBasicFieldsSection.contentHeading}}" stepKey="lostFocusFromWYSIWYG"/>
93+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG3"/>
8394
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
8495
<argument name="contentType" value="PageBuilderTextContentType"/>
8596
</actionGroup>
@@ -88,8 +99,8 @@
8899
<switchToIFrame stepKey="exitIFrame3"/>
89100
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
90101
<!--Input image into stage-->
91-
<comment userInput="Input text into stage" stepKey="commentInputImageIntoStage"/>
92-
<click selector="{{TextOnStage.tinymce}}" stepKey="focusOnTextEditorArea"/>
102+
<comment userInput="Input image into stage" stepKey="commentInputImageIntoStage"/>
103+
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
93104
<click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
94105
<waitForPageLoad stepKey="waitForPageLoad" />
95106
<actionGroup ref="clickBrowseBtnOnUploadPopup" stepKey="clickBrowserBtn"/>
@@ -107,10 +118,10 @@
107118
<!--Verify Content Block on storefront-->
108119
<comment userInput="Verify empty Content Block on storefront" stepKey="commentVerifyEmptyBlock"/>
109120
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
110-
<see userInput="Hello World" stepKey="seeTextContentType"/>
111-
<seeElementInDOM selector="{{StorefrontCMSPageSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
112-
<seeElementInDOM selector="{{TextOnStorefront.text('1', _ENV.MAGENTO_BASE_URL)}}" stepKey="waitForVariableStorefront"/>
113-
<seeElementInDOM selector="div.block-cms-link a[href='{{_ENV.MAGENTO_BASE_URL}}/$$createCMSPageB.identifier$$']" stepKey="waitForWidgetStorefront"/>
121+
<see userInput="{{PageBuilderTextContentTypeDefault.value}}" stepKey="seeTextContentType"/>
122+
<seeElement selector="{{StorefrontCMSPageSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
123+
<seeElement selector="{{TextOnStorefront.text('1', _ENV.MAGENTO_BASE_URL)}}" stepKey="waitForVariableStorefront"/>
124+
<seeElement selector="{{TextOnStorefront.textAreaWidget('1', 'text', $$createCMSPageB.identifier$$)}}" stepKey="waitForWidgetStorefront"/>
114125
</test>
115126
<test name="ColumnAddToRowAndHeightAdjusts">
116127
<annotations>

0 commit comments

Comments
 (0)