Skip to content

Commit 4de4da5

Browse files
davemacaulaydavemacaulay
committed
PB-273: Remove 200ms delay from options menu & toolbar on content types
1 parent 4b1d117 commit 4de4da5

File tree

3 files changed

+64
-7
lines changed

3 files changed

+64
-7
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<waitForPageLoad stepKey="waitForEditorToBeFocused"/>
141141
<waitForElementVisible selector="{{section.tinymceInFocus(index)}}" stepKey="waitForEditorFocused"/>
142142
</actionGroup>
143-
<actionGroup name="moveCaretToEndTinyMCEEditor">
143+
<actionGroup name="goToEndOfLineTinyMCEEditor">
144144
<arguments>
145145
<argument name="section" defaultValue="TextOnStage"/>
146146
<argument name="index" defaultValue="1" type="string"/>
@@ -157,9 +157,17 @@
157157
</arguments>
158158
<comment userInput="focusOnInlineTextAreaEditor" stepKey="comment"/>
159159
<waitForElementVisible selector="{{section.textArea(index)}}" stepKey="waitForEditor"/>
160-
<clickWithLeftButton selector="{{section.tinymce(index)}}" x="{{contentTypeXCoordinate}}" y="{{contentTypeYCoordinate}}" stepKey="clickEditor"/>
160+
<clickWithLeftButton selector="{{section.textArea(index)}}" x="{{contentTypeXCoordinate}}" y="{{contentTypeYCoordinate}}" stepKey="clickEditor"/>
161161
<waitForPageLoad stepKey="waitForEditorToBeFocused"/>
162162
</actionGroup>
163+
<actionGroup name="goToEndOfLineTextAreaEditor">
164+
<arguments>
165+
<argument name="section" defaultValue="TextOnStage"/>
166+
<argument name="index" defaultValue="1" type="string"/>
167+
</arguments>
168+
<waitForElementVisible selector="{{section.textArea(index)}}" stepKey="waitForEditor"/>
169+
<pressKey selector="{{section.textArea(index)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::END]" stepKey="pressEndKey"/>
170+
</actionGroup>
163171
<actionGroup name="switchTabAndReloadPage">
164172
<switchToNextTab stepKey="switchToNextTab"/>
165173
<reloadPage stepKey="reloadPage"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,30 +144,30 @@
144144
<!-- Inline Edit: Add Text -->
145145
<comment userInput="Inline Edit: Add Text" stepKey="commentInlineEditAddText"/>
146146
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor"/>
147-
<actionGroup ref="moveCaretToEndTinyMCEEditor" stepKey="moveCaretToEnd"/>
147+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd"/>
148148
<actionGroup ref="addTextToTinyMCEInline" stepKey="addTextToTinyMCEInline">
149149
<argument name="section" value="TextOnStage"/>
150150
<argument name="text" value="{{PageBuilderTextProperty.value}}"/>
151151
</actionGroup>
152152
<!-- Inline Edit: Add Variable -->
153153
<comment userInput="Inline Edit: Add Variable" stepKey="commentInlineEditAddVariable"/>
154154
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor2"/>
155-
<actionGroup ref="moveCaretToEndTinyMCEEditor" stepKey="moveCaretToEnd2"/>
155+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd2"/>
156156
<actionGroup ref="addVariableToTinyMCEInline" stepKey="addVariableToTinyMCE">
157157
<argument name="variable" value="TinyMCEVariableBaseURL"/>
158158
</actionGroup>
159159
<!-- Inline Edit: Add Widget -->
160160
<comment userInput="Inline Edit: Add Widget" stepKey="commentInlineEditAddWidget"/>
161161
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor3"/>
162-
<actionGroup ref="moveCaretToEndTinyMCEEditor" stepKey="moveCaretToEnd3"/>
162+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd3"/>
163163
<actionGroup ref="addPageLinkWidgetToTinyMCEInline" stepKey="addPageLinkWidgetToTinyMCE">
164164
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
165165
<argument name="page" value="$$createPreReqCMSPage.identifier$$"/>
166166
</actionGroup>
167167
<!-- Inline Edit: Add Image -->
168168
<comment userInput="Inline Edit: Add Image" stepKey="commentInlineEditAddImage"/>
169169
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor4"/>
170-
<actionGroup ref="moveCaretToEndTinyMCEEditor" stepKey="moveCaretToEnd4"/>
170+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd4"/>
171171
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
172172
<actionGroup ref="clickBrowseBtnOnUploadPopup" stepKey="clickBrowserBtn"/>
173173
<actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>

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

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,9 @@
905905
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor">
906906
<argument name="section" value="BannerOnBackend"/>
907907
</actionGroup>
908+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd">
909+
<argument name="section" value="BannerOnBackend"/>
910+
</actionGroup>
908911
<actionGroup ref="addTextToTinyMCEInline" stepKey="addTextToTinyMCEInline">
909912
<argument name="section" value="BannerOnBackend"/>
910913
<argument name="text" value="{{PageBuilderBannerMessageProperty.value}}"/>
@@ -914,6 +917,9 @@
914917
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor2">
915918
<argument name="section" value="BannerOnBackend"/>
916919
</actionGroup>
920+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd2">
921+
<argument name="section" value="BannerOnBackend"/>
922+
</actionGroup>
917923
<actionGroup ref="addVariableToTinyMCEInline" stepKey="addVariableToTinyMCE">
918924
<argument name="variable" value="TinyMCEVariableBaseURL"/>
919925
</actionGroup>
@@ -922,6 +928,9 @@
922928
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor3">
923929
<argument name="section" value="BannerOnBackend"/>
924930
</actionGroup>
931+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd3">
932+
<argument name="section" value="BannerOnBackend"/>
933+
</actionGroup>
925934
<actionGroup ref="addPageLinkWidgetToTinyMCEInline" stepKey="addPageLinkWidgetToTinyMCE">
926935
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
927936
<argument name="page" value="$$createPreReqCMSPage.identifier$$"/>
@@ -931,6 +940,9 @@
931940
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor4">
932941
<argument name="section" value="BannerOnBackend"/>
933942
</actionGroup>
943+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd4">
944+
<argument name="section" value="BannerOnBackend"/>
945+
</actionGroup>
934946
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
935947
<actionGroup ref="clickBrowseBtnOnUploadPopup" stepKey="clickBrowserBtn"/>
936948
<actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>
@@ -1064,6 +1076,9 @@
10641076
<actionGroup ref="focusOnInlineTextAreaEditor" stepKey="focusOnInlineTextAreaEditor">
10651077
<argument name="section" value="BannerOnBackend"/>
10661078
</actionGroup>
1079+
<actionGroup ref="goToEndOfLineTextAreaEditor" stepKey="goToEndOfLine">
1080+
<argument name="section" value="BannerOnBackend"/>
1081+
</actionGroup>
10671082
<actionGroup ref="addTextToTinyMCEInlineWYSIWYGDisabled" stepKey="addTextToTinyMCEInline">
10681083
<argument name="section" value="BannerOnBackend"/>
10691084
<argument name="text" value="{{PageBuilderBannerMessageProperty.value}}"/>
@@ -1072,6 +1087,9 @@
10721087
<actionGroup ref="focusOnInlineTextAreaEditor" stepKey="focusOnInlineTextAreaEditor2">
10731088
<argument name="section" value="BannerOnBackend"/>
10741089
</actionGroup>
1090+
<actionGroup ref="goToEndOfLineTextAreaEditor" stepKey="goToEndOfLine2">
1091+
<argument name="section" value="BannerOnBackend"/>
1092+
</actionGroup>
10751093
<actionGroup ref="addTextToTinyMCEInlineWYSIWYGDisabled" stepKey="addVariableToTinyMCE">
10761094
<argument name="section" value="BannerOnBackend"/>
10771095
<argument name="text" value="{{PageBuilderTextArea_VariableBaseURL.editPanelValue}}"/>
@@ -1081,6 +1099,9 @@
10811099
<actionGroup ref="focusOnInlineTextAreaEditor" stepKey="focusOnInlineTextAreaEditor3">
10821100
<argument name="section" value="BannerOnBackend"/>
10831101
</actionGroup>
1102+
<actionGroup ref="goToEndOfLineTextAreaEditor" stepKey="goToEndOfLine3">
1103+
<argument name="section" value="BannerOnBackend"/>
1104+
</actionGroup>
10841105
<actionGroup ref="addTextToTinyMCEInlineWYSIWYGDisabled" stepKey="addPageLinkWidgetToTinyMCE">
10851106
<argument name="section" value="BannerOnBackend"/>
10861107
<argument name="text" value="{{PageBuilderTextArea_WidgetCMSHomepageLink.editPanelValue}}"/>
@@ -1171,6 +1192,9 @@
11711192
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor">
11721193
<argument name="section" value="SlideOnBackend"/>
11731194
</actionGroup>
1195+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd">
1196+
<argument name="section" value="SlideOnBackend"/>
1197+
</actionGroup>
11741198
<actionGroup ref="addTextToTinyMCEInline" stepKey="addTextToTinyMCEInline">
11751199
<argument name="section" value="SlideOnBackend"/>
11761200
<argument name="text" value="{{PageBuilderSlideItemContent_Slide1.value}}"/>
@@ -1803,6 +1827,9 @@
18031827
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor">
18041828
<argument name="section" value="SlideOnBackend"/>
18051829
</actionGroup>
1830+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd">
1831+
<argument name="section" value="SlideOnBackend"/>
1832+
</actionGroup>
18061833
<actionGroup ref="addTextToTinyMCEInline" stepKey="addTextToTinyMCEInline">
18071834
<argument name="section" value="SlideOnBackend"/>
18081835
<argument name="text" value="{{PageBuilderSlideItemContent_Slide1.value}}"/>
@@ -1812,6 +1839,9 @@
18121839
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor2">
18131840
<argument name="section" value="SlideOnBackend"/>
18141841
</actionGroup>
1842+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd2">
1843+
<argument name="section" value="SlideOnBackend"/>
1844+
</actionGroup>
18151845
<actionGroup ref="addVariableToTinyMCEInline" stepKey="addVariableToTinyMCE">
18161846
<argument name="variable" value="TinyMCEVariableBaseURL"/>
18171847
</actionGroup>
@@ -1820,6 +1850,9 @@
18201850
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor3">
18211851
<argument name="section" value="SlideOnBackend"/>
18221852
</actionGroup>
1853+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd3">
1854+
<argument name="section" value="SlideOnBackend"/>
1855+
</actionGroup>
18231856
<actionGroup ref="addPageLinkWidgetToTinyMCEInline" stepKey="addPageLinkWidgetToTinyMCE">
18241857
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
18251858
<argument name="page" value="$$createPreReqCMSPage.identifier$$"/>
@@ -1829,6 +1862,9 @@
18291862
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor4">
18301863
<argument name="section" value="SlideOnBackend"/>
18311864
</actionGroup>
1865+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd4">
1866+
<argument name="section" value="SlideOnBackend"/>
1867+
</actionGroup>
18321868
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
18331869
<actionGroup ref="clickBrowseBtnOnUploadPopup" stepKey="clickBrowserBtn"/>
18341870
<actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>
@@ -1847,6 +1883,9 @@
18471883
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor5">
18481884
<argument name="section" value="SlideOnBackend"/>
18491885
</actionGroup>
1886+
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd5">
1887+
<argument name="section" value="SlideOnBackend"/>
1888+
</actionGroup>
18501889
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeTextCMSBlockStage"/>
18511890
<seeElement selector="{{SlideOnBackend.messageContent('1', TinyMCEVariableBaseURL.editPanelValue)}}" stepKey="seeVariableCMSBlockStage"/>
18521891
<seeElement selector="{{SlideOnBackend.messageContent('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="seeWidgetCMSBlockStage"/>
@@ -1928,11 +1967,12 @@
19281967
<severity value="CRITICAL"/>
19291968
<testCaseId value="MC-15213"/>
19301969
<useCaseId value="MC-13769"/>
1931-
<group value="pagebuilder"/>
1970+
<!-- <group value="pagebuilder"/>-->
19321971
<group value="pagebuilder-block"/>
19331972
<group value="pagebuilder-block-content"/>
19341973
<group value="pagebuilder-slide"/>
19351974
<group value="pagebuilder-slideItemPoster"/>
1975+
<group value="dave"/>
19361976
</annotations>
19371977
<before>
19381978
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="configWYSIWYG"/>
@@ -1965,6 +2005,9 @@
19652005
<actionGroup ref="focusOnInlineTextAreaEditor" stepKey="focusOnInlineTextAreaEditor">
19662006
<argument name="section" value="SlideOnBackend"/>
19672007
</actionGroup>
2008+
<actionGroup ref="goToEndOfLineTextAreaEditor" stepKey="goToEndOfLine">
2009+
<argument name="section" value="SlideOnBackend"/>
2010+
</actionGroup>
19682011
<actionGroup ref="addTextToTinyMCEInlineWYSIWYGDisabled" stepKey="addTextToTinyMCEInline">
19692012
<argument name="section" value="SlideOnBackend"/>
19702013
<argument name="text" value="{{PageBuilderSlideItemContent_Slide1.value}}"/>
@@ -1973,6 +2016,9 @@
19732016
<actionGroup ref="focusOnInlineTextAreaEditor" stepKey="focusOnInlineTextAreaEditor2">
19742017
<argument name="section" value="SlideOnBackend"/>
19752018
</actionGroup>
2019+
<actionGroup ref="goToEndOfLineTextAreaEditor" stepKey="goToEndOfLine2">
2020+
<argument name="section" value="SlideOnBackend"/>
2021+
</actionGroup>
19762022
<actionGroup ref="addTextToTinyMCEInlineWYSIWYGDisabled" stepKey="addVariableToTinyMCE">
19772023
<argument name="section" value="SlideOnBackend"/>
19782024
<argument name="text" value="{{PageBuilderTextArea_VariableBaseURL.editPanelValue}}"/>
@@ -1982,6 +2028,9 @@
19822028
<actionGroup ref="focusOnInlineTextAreaEditor" stepKey="focusOnInlineTextAreaEditor3">
19832029
<argument name="section" value="SlideOnBackend"/>
19842030
</actionGroup>
2031+
<actionGroup ref="goToEndOfLineTextAreaEditor" stepKey="goToEndOfLine3">
2032+
<argument name="section" value="SlideOnBackend"/>
2033+
</actionGroup>
19852034
<actionGroup ref="addTextToTinyMCEInlineWYSIWYGDisabled" stepKey="addPageLinkWidgetToTinyMCE">
19862035
<argument name="section" value="SlideOnBackend"/>
19872036
<argument name="text" value="{{PageBuilderTextArea_WidgetCMSHomepageLink.editPanelValue}}"/>

0 commit comments

Comments
 (0)