Skip to content

Commit 175664b

Browse files
committed
Merge remote-tracking branch 'origin/develop' into PB-370-Introduce-upgrade-mechanism
2 parents 125bff7 + dfe36e7 commit 175664b

File tree

8 files changed

+49
-30
lines changed

8 files changed

+49
-30
lines changed

app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentFragmentInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface;
3939
/**
4040
* Returns string content of fragment
4141
*/
42-
public function prop_get_innerText(): string;
42+
public function propGetInnerText(): string;
4343
}

app/code/Magento/PageBuilder/Model/Dom/Document.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ class Document implements DocumentInterface
2323
/**
2424
* @var ObjectManagerInterface
2525
*/
26-
protected $objectManager;
26+
private $objectManager;
2727

2828
/**
2929
* @var GtDomDocument
3030
*/
31-
protected $document;
31+
private $document;
3232

3333
/**
3434
* Document constructor.

app/code/Magento/PageBuilder/Model/Dom/DocumentFragment.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface
7474
/**
7575
* @inheritDoc
7676
*/
77-
public function prop_get_innerText(): string
77+
public function propGetInnerText(): string
7878
{
7979
return $this->documentFragment->prop_get_innerText();
8080
}

app/code/Magento/PageBuilder/Model/Dom/HtmlDocument.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818
*/
1919
class HtmlDocument extends Document implements HtmlDocumentInterface
2020
{
21+
/**
22+
* @var ObjectManagerInterface
23+
*/
24+
private $objectManager;
25+
26+
/**
27+
* @var GtDomHTMLDocument
28+
*/
29+
private $document;
30+
2131
/**
2232
* HtmlDocument constructor.
2333
* @param ObjectManagerInterface $objectManager

app/code/Magento/PageBuilder/Model/Dom/XmlDocument.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616
*/
1717
class XmlDocument extends Document implements XmlDocumentInterface
1818
{
19+
/**
20+
* @var ObjectManagerInterface
21+
*/
22+
private $objectManager;
23+
24+
/**
25+
* @var GtDomXmlDocument
26+
*/
27+
private $document;
28+
1929
/**
2030
* XmlDocument constructor.
2131
*

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,13 @@
182182
<description>Opens the Page Builder Apply Template slide out from the Page Builder stage.</description>
183183
</annotations>
184184
<arguments>
185-
<argument name="title" defaultValue="Apply Template" type="string"/>
186185
<argument name="pageBuilderArea" defaultValue="" type="string"/>
187186
</arguments>
188187
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.applyTemplateButton}}" stepKey="waitForApplyTemplateButton"/>
189188
<click selector="{{pageBuilderArea}}{{PageBuilderStage.applyTemplateButton}}" stepKey="clickApplyTemplateButton"/>
190189
<waitForPageLoad stepKey="waitForSlideOutLoad"/>
191190
<waitForElementVisible selector="{{PageBuilderApplyTemplateSlideOut.activeSlideOut}}" stepKey="waitForSlideOut"/>
192-
<see userInput="{{title}}" selector="{{PageBuilderApplyTemplateSlideOut.title}}" stepKey="seeTitle"/>
191+
<see userInput="Apply Template" selector="{{PageBuilderApplyTemplateSlideOut.title}}" stepKey="seeTitle"/>
193192
<waitForPageLoad stepKey="waitForSlideOutForm"/>
194193
</actionGroup>
195194
<actionGroup name="closePageBuilderApplyTemplateSlideOut">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<!-- Save Template -->
4040
<actionGroup ref="openPageBuilderSaveTemplateModal" stepKey="openPageBuilderSaveTemplateModal"/>
4141
<actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateForm"/>
42-
<generateDate date="now" format="M d, Y g:" stepKey="today"/>
42+
<generateDate date="now" format="M j, Y g:" stepKey="today"/>
4343
<generateDate date="now" format="A" stepKey="todayAMorPM"/>
4444
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate"/>
4545
<!-- Verify Info on Apply Template Slide Out -->
@@ -233,7 +233,7 @@
233233
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
234234
<actionGroup ref="openPageBuilderSaveTemplateModal" stepKey="openPageBuilderSaveTemplateModal"/>
235235
<actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateForm"/>
236-
<generateDate date="now" format="M d, Y g:" stepKey="today"/>
236+
<generateDate date="now" format="M j, Y g:" stepKey="today"/>
237237
<generateDate date="now" format="A" stepKey="todayAMorPM"/>
238238
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate"/>
239239
<!-- Verify Info on Template Grid Page -->
@@ -706,7 +706,7 @@
706706
<actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateFormCommonCharacters">
707707
<argument name="templateName" value="{{PageBuilderTemplateName_EdgeCases.commonCharacters}}"/>
708708
</actionGroup>
709-
<generateDate date="now" format="M d, Y g:" stepKey="today"/>
709+
<generateDate date="now" format="M j, Y g:" stepKey="today"/>
710710
<generateDate date="now" format="A" stepKey="todayAMorPM"/>
711711
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplateZeroCommonCharacters"/>
712712
<!-- Validate Common Characters Template -->

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
</actionGroup>
397397
<!--Input text into stage-->
398398
<comment userInput="Input text into stage" stepKey="commentInputTextIntoStage"/>
399-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
399+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
400400
<fillField selector="{{TextOnStage.tinymce('1')}}" userInput="{{PageBuilderTextContentTypeDefault.value}}" stepKey="fillTextToTinyMCE4"/>
401401
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG1"/>
402402
<!--Verify inputed text on slideout-->
@@ -410,7 +410,7 @@
410410
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings1"/>
411411
<!--Input variable into stage-->
412412
<comment userInput="Input variable into stage" stepKey="commentInputVariableIntoStage"/>
413-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea1"/>
413+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea1"/>
414414
<actionGroup ref="addVariableToTinyMCEInline" stepKey="addVariableToTinyMCE">
415415
<argument name="variable" value="TinyMCEVariableBaseURL"/>
416416
</actionGroup>
@@ -427,7 +427,7 @@
427427
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
428428
<!--Input widget into stage-->
429429
<comment userInput="Input widget into stage" stepKey="commentInputWidgetIntoStage"/>
430-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea2"/>
430+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea2"/>
431431
<actionGroup ref="addPageLinkWidgetToTinyMCEInline" stepKey="addPageLinkWidgetToTinyMCE">
432432
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
433433
<argument name="page" value="$$createCMSPageB.identifier$$"/>
@@ -443,7 +443,7 @@
443443
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
444444
<!--Input image into stage-->
445445
<comment userInput="Input image into stage" stepKey="commentInputImageIntoStage"/>
446-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
446+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
447447
<waitForElementVisible selector="{{TinyMCESection.InsertImageIcon}}" stepKey="waitForInsertImageIcon"/>
448448
<click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon"/>
449449
<waitForPageLoad stepKey="waitForPageLoad" />
@@ -542,7 +542,7 @@
542542
</actionGroup>
543543
<!--Input text into stage-->
544544
<comment userInput="Input text into stage" stepKey="commentInputTextIntoStage"/>
545-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
545+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
546546
<fillField selector="{{TextOnStage.tinymce('1')}}" userInput="{{PageBuilderTextContentTypeDefault.value}}" stepKey="fillTextToTinyMCE4"/>
547547
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG1"/>
548548
<!--Verify inputed text on slideout-->
@@ -605,7 +605,7 @@
605605
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
606606
<argument name="contentType" value="PageBuilderTextContentType"/>
607607
</actionGroup>
608-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
608+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
609609
<waitForElementVisible selector="{{TinyMCESection.InsertImageIcon}}" stepKey="waitForInsertImageIcon"/>
610610
<click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
611611
<waitForPageLoad stepKey="waitForPageLoad" />
@@ -672,7 +672,7 @@
672672
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
673673
<argument name="contentType" value="PageBuilderTextContentType"/>
674674
</actionGroup>
675-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
675+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
676676
<actionGroup ref="addVariableToTinyMCEInline" stepKey="addVariableToTinyMCE">
677677
<argument name="variable" value="TinyMCEVariableCountry"/>
678678
</actionGroup>
@@ -744,7 +744,7 @@
744744
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
745745
<argument name="contentType" value="PageBuilderTextContentType"/>
746746
</actionGroup>
747-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
747+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
748748
<actionGroup ref="addPageLinkWidgetToTinyMCEInline" stepKey="addPageLinkWidgetToTinyMCE">
749749
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
750750
<argument name="page" value="$$createCMSPageB.identifier$$"/>
@@ -814,7 +814,7 @@
814814
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
815815
<argument name="contentType" value="PageBuilderTextContentType"/>
816816
</actionGroup>
817-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
817+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
818818
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
819819
<actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
820820
<seeElement selector="{{WYSIWYGOnPageBuilderInline.undo}}" stepKey="seeUndo"/>
@@ -871,7 +871,7 @@
871871
<see userInput="72px" stepKey="seeLineHeight72px" />
872872
<!--Verify FontStyle on preview-->
873873
<comment userInput="Verify FontStyle on preview" stepKey="commentVerifyFontsizeOnPreview"/>
874-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
874+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
875875
<fillField selector="{{TextOnStage.tinymce('1')}}" userInput="{{PageBuilderTextProperty.value}}" stepKey="fillTextToTinyMCE4"/>
876876
<click selector="{{WYSIWYGOnPageBuilderInline.formatSelector}}" stepKey="expandFormatList"/>
877877
<see userInput="Important" stepKey="seeImportantStyle"/>
@@ -2137,7 +2137,7 @@
21372137
</actionGroup>
21382138
<!--Input text into stage-->
21392139
<comment userInput="Input text into stage" stepKey="commentInputTextIntoStage"/>
2140-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
2140+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
21412141
<fillField selector="{{TextOnStage.tinymce('1')}}" userInput="{{PageBuilderTextContentTypeDefault.value}}" stepKey="fillTextToTinyMCE4"/>
21422142
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG1"/>
21432143
<!--Verify inputed text on slideout-->
@@ -2151,7 +2151,7 @@
21512151
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings1"/>
21522152
<!--Input variable into stage-->
21532153
<comment userInput="Input variable into stage" stepKey="commentInputVariableIntoStage"/>
2154-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea1"/>
2154+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea1"/>
21552155
<actionGroup ref="addVariableToTinyMCEInline" stepKey="addVariableToTinyMCE">
21562156
<argument name="variable" value="TinyMCEVariableBaseURL"/>
21572157
</actionGroup>
@@ -2168,7 +2168,7 @@
21682168
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
21692169
<!--Input widget into stage-->
21702170
<comment userInput="Input widget into stage" stepKey="commentInputWidgetIntoStage"/>
2171-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea2"/>
2171+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea2"/>
21722172
<actionGroup ref="addPageLinkWidgetToTinyMCEInline" stepKey="addPageLinkWidgetToTinyMCE">
21732173
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
21742174
<argument name="page" value="$$createCMSPageB.identifier$$"/>
@@ -2184,7 +2184,7 @@
21842184
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
21852185
<!--Input image into stage-->
21862186
<comment userInput="Input image into stage" stepKey="commentInputImageIntoStage"/>
2187-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
2187+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
21882188
<waitForElementVisible selector="{{TinyMCESection.InsertImageIcon}}" stepKey="waitForInsertImageIcon"/>
21892189
<click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon"/>
21902190
<waitForPageLoad stepKey="waitForPageLoad" />
@@ -2390,7 +2390,7 @@
23902390
</actionGroup>
23912391
<!-- Add variable to text on stage -->
23922392
<comment userInput="Add variable to text on stage" stepKey="commentAddVariableToTextOnStage"/>
2393-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea1"/>
2393+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea1"/>
23942394
<actionGroup ref="addVariableToTinyMCEInline" stepKey="addVariableToTinyMCEInline">
23952395
<argument name="variable" value="TinyMCEVariableStoreName"/>
23962396
</actionGroup>
@@ -2458,7 +2458,7 @@
24582458
</actionGroup>
24592459
<!--Input variable into stage-->
24602460
<comment userInput="Input variable into stage" stepKey="commentInputVariableIntoStage"/>
2461-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea1"/>
2461+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea1"/>
24622462
<waitForPageLoad stepKey="waitForTextEditor1"/>
24632463
<actionGroup ref="addVariableToTinyMCEInline" stepKey="addVariableToTinyMCE">
24642464
<argument name="variable" value="TinyMCEVariableBaseURL"/>
@@ -2539,7 +2539,7 @@
25392539
<comment userInput="Removed closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
25402540
<!-- Add Image to Text -->
25412541
<comment userInput="Add Image to Text" stepKey="commentAddImageToContentType"/>
2542-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
2542+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
25432543
<!-- Validate Image Editor On Backend -->
25442544
<seeElement selector="{{TextOnStage.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditor"/>
25452545
<!-- Validate Image Editor On Backend After Save -->
@@ -2835,7 +2835,7 @@
28352835
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
28362836
<argument name="contentType" value="PageBuilderTextContentType"/>
28372837
</actionGroup>
2838-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
2838+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
28392839
<comment userInput="Write text into WYSIWYG" stepKey="commentWriteTextIntoWysiwyg"/>
28402840
<pressKey selector="{{TextOnStage.tinymce('1')}}" userInput="{{PageBuilderVariableWidgetText.value}}" stepKey="fillWysiwygField"/>
28412841
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderVariableWidgetText.value)}}" stepKey="waitForTextOnStage"/>
@@ -2904,7 +2904,7 @@
29042904
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
29052905
<argument name="contentType" value="PageBuilderTextContentType"/>
29062906
</actionGroup>
2907-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
2907+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
29082908
<comment userInput="Write text into WYSIWYG" stepKey="commentWriteTextIntoWysiwyg"/>
29092909
<pressKey selector="{{TextOnStage.tinymce('1')}}" userInput="{{PageBuilderVariableWidgetText.value}}" stepKey="fillWysiwygField"/>
29102910
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderVariableWidgetText.value)}}" stepKey="waitForTextOnStage"/>
@@ -2972,7 +2972,7 @@
29722972
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
29732973
<argument name="contentType" value="PageBuilderTextContentType"/>
29742974
</actionGroup>
2975-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
2975+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
29762976
<comment userInput="Write text into WYSIWYG" stepKey="commentWriteTextIntoWysiwyg"/>
29772977
<pressKey selector="{{TextOnStage.tinymce('1')}}" userInput="{{PageBuilderVariableWidgetText.value}}" stepKey="fillWysiwygField"/>
29782978
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderVariableWidgetText.value)}}" stepKey="waitForTextOnStage"/>
@@ -3021,7 +3021,7 @@
30213021
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
30223022
<argument name="contentType" value="PageBuilderTextContentType"/>
30233023
</actionGroup>
3024-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
3024+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
30253025
<comment userInput="Write text into WYSIWYG" stepKey="commentWriteTextIntoWysiwyg"/>
30263026
<pressKey selector="{{TextOnStage.tinymce('1')}}" userInput="{{PageBuilderTextProperty.value}}" stepKey="fillWysiwygField"/>
30273027
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="waitForTextOnStage"/>

0 commit comments

Comments
 (0)