Skip to content

Commit 3e13b74

Browse files
nathanjosiahnathanjosiah
committed
Merge branch 'MC-1416' of github.com:magento-trigger/magento2-page-builder into MC-1416
2 parents b1def07 + 248c97a commit 3e13b74

File tree

4 files changed

+46
-25
lines changed

4 files changed

+46
-25
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
4949
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
5050
</arguments>
51+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocus"/>
5152
<waitForElementVisible time="30" selector="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/>
5253
<dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/>
5354
<waitForPageLoad stepKey="waitForAnimation" time="30"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/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-text')])[{{arg1}}]/div" parameterized="true"/>
12-
<element name="textAreaText" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[.='{{arg2}}']" parameterized="true"/>
12+
<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"/>
14-
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//p[contains(.,'{{arg2}}')]/span" parameterized="true"/>
14+
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//span[contains(.,'{{arg2}}')]" parameterized="true"/>
1515
<element name="placeholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
1616
<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"/>
17+
<element name="importantStyle" type="text" selector="//span[text()='Important']"/>
1818
<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"/>
1919
<!-- Advanced Configuration -->
2020
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
@@ -54,7 +54,7 @@
5454
<element name="textAreaText" type="text" selector="(//div[@data-role='text'])[{{arg1}}][.='{{arg2}}']" parameterized="true"/>
5555
<element name="textAreaWidget" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
5656
<element name="textAreaVariable" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
57-
<element name="text" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//p[contains(text(),'{{arg2}}')]" parameterized="true"/>
57+
<element name="text" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//div[contains(text(),'{{arg2}}')]" parameterized="true"/>
5858
<element name="empty" type="text" selector="//div[@data-role='text'][{{arg1}}][not(*)]" parameterized="true"/>
5959
<!-- Advanced Configuration -->
6060
<element name="alignment" type="text" selector="(//div[@data-role='text'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<severity value="CRITICAL"/>
1818
<useCaseId value="MC-1416"/>
1919
<testCaseId value="MC-3469"/>
20-
<group value="kieu"/>
20+
<group value="pagebuilder"/>
2121
<group value="pagebuilder-text"/>
2222
<group value="pagebuilder-column-content"/>
2323
</annotations>
@@ -29,12 +29,6 @@
2929
</before>
3030
<after>
3131
<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>
3832
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
3933
<deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB" />
4034
<actionGroup ref="logout" stepKey="logout"/>
@@ -45,6 +39,9 @@
4539
<actionGroup ref="dragContentTypeToStage" stepKey="dragThirdColumnIntoStage">
4640
<argument name="contentType" value="PageBuilderColumnContentType"/>
4741
</actionGroup>
42+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
43+
<argument name="group" value="PageBuilderTextContentType"/>
44+
</actionGroup>
4845
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextToColumn">
4946
<argument name="contentType" value="PageBuilderTextContentType"/>
5047
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
3333
<argument name="CMSPage" value="$$createCMSPage$$"/>
3434
</actionGroup>
35+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup1">
36+
<argument name="group" value="PageBuilderTextContentType"/>
37+
</actionGroup>
3538
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
3639
<argument name="contentType" value="PageBuilderTextContentType"/>
3740
</actionGroup>
@@ -69,6 +72,9 @@
6972
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
7073
<argument name="CMSPage" value="$$createCMSPage$$"/>
7174
</actionGroup>
75+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup1">
76+
<argument name="group" value="PageBuilderTextContentType"/>
77+
</actionGroup>
7278
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
7379
<argument name="contentType" value="PageBuilderTextContentType"/>
7480
</actionGroup>
@@ -87,6 +93,7 @@
8793
<switchToIFrame stepKey="exitIFrame1"/>
8894
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
8995
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
96+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
9097
<!--Verify Text Content Type on stage after saving cms page-->
9198
<comment userInput="Verify text content type on storefront" stepKey="commentVerifyTextOnStage"/>
9299
<see userInput="{{PageBuilderTextContentTypeDefault.value}}" stepKey="seeTextOnStage"/>
@@ -113,8 +120,9 @@
113120
</before>
114121
<after>
115122
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
123+
<click selector="{{MediaGallerySection.WysiwygArrow}}" stepKey="openWYSIWYGFolder"/>
116124
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
117-
<argument name="FolderName" value="{{ImageUpload3.path}}"/>
125+
<argument name="FolderName" value="{{ImageFolder.name}}"/>
118126
</actionGroup>
119127
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
120128
<argument name="Image" value="ImageUpload3"/>
@@ -125,6 +133,9 @@
125133
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
126134
<argument name="CMSPage" value="$$createCMSPage$$"/>
127135
</actionGroup>
136+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup1">
137+
<argument name="group" value="PageBuilderTextContentType"/>
138+
</actionGroup>
128139
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
129140
<argument name="contentType" value="PageBuilderTextContentType"/>
130141
</actionGroup>
@@ -141,7 +152,7 @@
141152
</actionGroup>
142153
<actionGroup ref="saveImage" stepKey="insertImage"/>
143154
<actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
144-
<seeElement selector="{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSourceOnStage1"/>
155+
<waitForElementVisible selector="{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSourceOnStage1"/>
145156
<!--Verify inputed image on slideout-->
146157
<comment userInput="Verify inputed variable on slideout" stepKey="commentVerifyVariableOnSlideout"/>
147158
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG1"/>
@@ -154,12 +165,13 @@
154165
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
155166
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
156167
<!--Verify image on stage after saving cms page-->
157-
<comment userInput="Verify image on storefront" stepKey="commentVerifyImageOnStage"/>
158-
<seeElementInDOM selector="{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSourceOnStage2"/>
168+
<comment userInput="Verify image on stage" stepKey="commentVerifyImageOnStage"/>
169+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
170+
<waitForElementVisible selector="{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSourceOnStage2"/>
159171
<!--Verify image on storefront-->
160172
<comment userInput="Verify image on storefront" stepKey="commentVerifyImageOnStorefront"/>
161173
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
162-
<seeElement selector="{{StorefrontCMSPageSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
174+
<waitForElementVisible selector="{{StorefrontCMSPageSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
163175
</test>
164176
<test name="InlineVariableEditing">
165177
<annotations>
@@ -185,6 +197,9 @@
185197
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
186198
<argument name="CMSPage" value="$$createCMSPage$$"/>
187199
</actionGroup>
200+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup1">
201+
<argument name="group" value="PageBuilderTextContentType"/>
202+
</actionGroup>
188203
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
189204
<argument name="contentType" value="PageBuilderTextContentType"/>
190205
</actionGroup>
@@ -202,7 +217,7 @@
202217
<waitForElementVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForInsertVariable2"/>
203218
<click selector="{{VariableSection.InsertWidget}}" stepKey="clickInsertVariable2"/>
204219
<waitForElementNotVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForVariableModalToClose"/>
205-
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEVariableBaseURL.editPanelValue)}}" stepKey="waitForVariabBaseURLleStage"/>
220+
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEVariableBaseURL.editPanelValue)}}" stepKey="waitForVariabBaseURLleStage1"/>
206221
<!--Verify inputed variable on slideout-->
207222
<comment userInput="Verify inputed variable on slideout" stepKey="commentVerifyVariableOnSlideout"/>
208223
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG"/>
@@ -214,11 +229,12 @@
214229
<switchToIFrame stepKey="exitIFrame"/>
215230
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
216231
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
217-
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEVariableCountry.editPanelValue)}}" stepKey="waitForVariableCountryStage2"/>
232+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
233+
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEVariableBaseURL.editPanelValue)}}" stepKey="waitForVariabBaseURLleStage2"/>
218234
<!-- Validate Storefront -->
219235
<comment userInput="Verify variable on storefront" stepKey="commentVerifyEmptyBlock"/>
220236
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
221-
<seeElement selector="{{TextOnStorefront.text('1', _ENV.MAGENTO_BASE_URL)}}" stepKey="waitForVariableStorefront"/>
237+
<waitForElementVisible selector="{{TextOnStorefront.text('1', _ENV.MAGENTO_BASE_URL)}}" stepKey="waitForVariableStorefront"/>
222238
</test>
223239
<test name="InlineWidgetEditing">
224240
<annotations>
@@ -246,6 +262,9 @@
246262
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
247263
<argument name="CMSPage" value="$$createCMSPageA$$"/>
248264
</actionGroup>
265+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup1">
266+
<argument name="group" value="PageBuilderTextContentType"/>
267+
</actionGroup>
249268
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
250269
<argument name="contentType" value="PageBuilderTextContentType"/>
251270
</actionGroup>
@@ -258,9 +277,10 @@
258277
<!--Verify widget edit page-->
259278
<comment userInput="Verify widget edit page" stepKey="commentVerifyEditWidget"/>
260279
<doubleClick selector="{{TextOnStage.text('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="doubleClickOnWidgetPlaceholder"/>
280+
<waitForPageLoad stepKey="waitForPageLoad"/>
261281
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
262-
<waitForElementVisible selector="{{WidgetSection.WidgetType}}" stepKey="waitForWidgetType"/>
263-
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget2"/>
282+
<waitForElementVisible selector="{{WidgetSection.CancelBtnEnabled}}" stepKey="waitForWidgetType"/>
283+
<click selector="{{WidgetSection.CancelBtnEnabled}}" stepKey="clickInsertWidget2"/>
264284
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear5"/>
265285
<waitForElementNotVisible selector="{{WidgetSection.InsertWidget}}" stepKey="waitForInsertWidgetModalToClose"/>
266286
<!--Verify inputed widget on slideout-->
@@ -276,6 +296,7 @@
276296
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
277297
<!-- Validate stage -->
278298
<comment userInput="Verify Widget Content Type on storefront" stepKey="commentVerifyWidgetOnStage"/>
299+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
279300
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="waitForWidgetStage2"/>
280301
<!-- Validate Storefront -->
281302
<comment userInput="Verify Widget Content Type on storefront" stepKey="commentVerifyWidgetOnStorefront"/>
@@ -306,10 +327,13 @@
306327
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
307328
<argument name="CMSPage" value="$$createCMSPage$$"/>
308329
</actionGroup>
330+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup1">
331+
<argument name="group" value="PageBuilderTextContentType"/>
332+
</actionGroup>
309333
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
310334
<argument name="contentType" value="PageBuilderTextContentType"/>
311335
</actionGroup>
312-
<click selector="{{TextOnStage.tinymce(1)}}" stepKey="focusOnTextEditorArea"/>
336+
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
313337
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
314338
<actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
315339
<seeElement selector="{{WYSIWYGOnPageBuilder.undo}}" stepKey="seeUndo"/>
@@ -739,6 +763,7 @@
739763
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
740764
<argument name="index" value="1"/>
741765
</actionGroup>
766+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG1"/>
742767
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
743768
<argument name="contentType" value="PageBuilderTextContentType"/>
744769
</actionGroup>
@@ -860,9 +885,6 @@
860885
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
861886
<argument name="group" value="PageBuilderTextContentType"/>
862887
</actionGroup>
863-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroupText">
864-
<argument name="group" value="PageBuilderTextContentType"/>
865-
</actionGroup>
866888
<actionGroup ref="dragContentTypeToStage" stepKey="dragIntoStage">
867889
<argument name="contentType" value="PageBuilderTextContentType"/>
868890
</actionGroup>
@@ -900,6 +922,7 @@
900922
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
901923
</actionGroup>
902924
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
925+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG1"/>
903926
<!-- Duplicate and Validate Stage -->
904927
<comment userInput="Duplicate" stepKey="commentDuplicate"/>
905928
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType">

0 commit comments

Comments
 (0)