Skip to content

Commit 8f91ba2

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into ACQE-functional-deployment-version10
2 parents ad37524 + b1b5e0c commit 8f91ba2

File tree

273 files changed

+119177
-1053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+119177
-1053
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeContentOfWysiwygEditorForDisabledByDefaultTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<click selector="{{ProductShortDescriptionWysiwygSection.form}} {{TinyMCESection.EditArea}}" stepKey="focusProductShortDescriptionWysiwyg2"/>
9999
<waitForElementVisible selector="{{ProductShortDescriptionWysiwygSection.form}} {{TinyMCESection.TinyMCE}}" stepKey="waitForShortDescription2" />
100100
<!-- Step-9: Change editor content into Short description -->
101-
<executeJS function="tinyMCE.get('product_form_short_description').setContent('Hello World! Short Content');" stepKey="executeJSFillContent2"/>
101+
<executeJS function="hugerte.get('product_form_short_description').setContent('Hello World! Short Content');" stepKey="executeJSFillContent2"/>
102102
<scrollTo selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.ShowHideBtn}}" y="-150" x="0" stepKey="scrollToDesShowHideBtn1" />
103103
<click selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.ShowHideBtn}}" stepKey="clickShowHideEditorBtn1" />
104104
<!-- Step-10: Save entity you are editing (Short Description) -->
@@ -261,7 +261,7 @@
261261
<click selector="{{TinyMCESection.ShowHideBtn}}" stepKey="toggleShowHiddenForCategory2"/>
262262
<waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCECategory2" />
263263
<!-- Step-9: Change content into Category -->
264-
<executeJS function="tinyMCE.get('category_form_description').setContent('Hello Category World!');" stepKey="executeJSFillContent"/>
264+
<executeJS function="hugerte.get('category_form_description').setContent('Hello Category World!');" stepKey="executeJSFillContent"/>
265265
<click selector="{{TinyMCESection.ShowHideBtn}}" stepKey="clickOnShowHideEditorBtn" />
266266
<waitForElementVisible selector="{{TinyMCESection.InsertImageBtn}}" stepKey="waitForInsertImage" />
267267
<!-- Step-10: Save entity you are editing (Category) -->

‎app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEIsNativeWYSIWYGOnCatalogTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCE" />
3232
<seeElement selector="{{TinyMCESection.ShowHideBtn}}" stepKey="seeShowHideBtn" />
3333
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE"/>
34-
<executeJS function="tinyMCE.get('category_form_description').setContent('Hello World!');" stepKey="executeJSFillContent"/>
34+
<executeJS function="hugerte.get('category_form_description').setContent('Hello World!');" stepKey="executeJSFillContent"/>
3535
<click selector="{{TinyMCESection.ShowHideBtn}}" stepKey="clickShowHideBtn" />
3636
<waitForElementVisible selector="{{TinyMCESection.InsertImageBtn}}" stepKey="waitForInsertImage" />
3737
<seeElement selector="{{TinyMCESection.InsertImageBtn}}" stepKey="insertImage"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEIsNativeWYSIWYGOnProductTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
<waitForElementVisible selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.TinyMCE}}" stepKey="waitForDescription" />
3838
<seeElement selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.TinyMCE}}" stepKey="TinyMCEDescription" />
3939
<click selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.EditArea}}" stepKey="focusProductDescriptionWysiwyg"/>
40-
<executeJS function="tinyMCE.get('product_form_description').setContent('Hello World!');" stepKey="executeJSFillContent1"/>
40+
<executeJS function="hugerte.get('product_form_description').setContent('Hello World!');" stepKey="executeJSFillContent1"/>
4141
<waitForElementVisible selector="{{ProductShortDescriptionWysiwygSection.form}} {{TinyMCESection.TinyMCE}}" stepKey="waitForShortDescription" />
4242
<seeElement selector="{{ProductShortDescriptionWysiwygSection.form}} {{TinyMCESection.TinyMCE}}" stepKey="TinyMCEShortDescription" />
4343
<click selector="{{ProductShortDescriptionWysiwygSection.form}} {{TinyMCESection.EditArea}}" stepKey="focusProductShortDescriptionWysiwyg"/>
44-
<executeJS function="tinyMCE.get('product_form_short_description').setContent('Hello World! Short Content');" stepKey="executeJSFillContent2"/>
44+
<executeJS function="hugerte.get('product_form_short_description').setContent('Hello World! Short Content');" stepKey="executeJSFillContent2"/>
4545
<scrollTo selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.ShowHideBtn}}" y="-150" x="0" stepKey="scrollToDesShowHideBtn1" />
4646
<click selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.ShowHideBtn}}" stepKey="clickShowHideBtn1" />
4747
<waitForElementVisible selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.InsertImageBtn}}" stepKey="waitForInsertImage1" />

‎app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<element name="UploadImageNew" type="file" selector="#upload_image"/>
2424
<element name="UploadImageSelector" type="file" selector="#fileUploader"/>
2525
<element name="UploadImageWithUploaderId" type="file" selector="#fileUploader + .uppy-Root .uppy-Dashboard-input"/>
26-
<element name="OkBtn" type="button" selector=".tox-dialog__footer button[title='Save']"/>
26+
<element name="OkBtn" type="button" selector=".tox-dialog__footer-end button[aria-label='Save']"/>
2727
<element name="insertBtn" type="button" selector="#insert"/>
2828
<element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
2929
<element name="CreateFolder" type="button" selector="#new_folder" timeout="30"/>

‎app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/TinyMCESection.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@
1010
<section name="TinyMCESection">
1111
<element name="checkIfContentTabOpen" type="button" selector="//span[text()='Content']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
1212
<element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
13-
<element name="TinyMCE" type="text" selector=".tox-tinymce"/>
13+
<element name="TinyMCE" type="text" selector=".tox-hugerte"/>
1414
<element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
15-
<element name="InsertWidgetIcon" type="button" selector="button[title='Insert Widget']" timeout="30"/>
15+
<element name="InsertWidgetIcon" type="button" selector="button[aria-label='Insert Widget']" timeout="30"/>
1616
<element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
17-
<element name="InsertVariableIcon" type="button" selector="button[title='Insert Variable']"/>
17+
<element name="InsertVariableIcon" type="button" selector="button[aria-label='Insert Variable']"/>
1818
<element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
19-
<element name="InsertImageIcon" type="button" selector="button[title='Insert/edit image']" timeout="30"/>
20-
<element name="Style" type="button" selector="button[title='Block Paragraph']"/>
21-
<element name="Bold" type="button" selector="button[title='Bold']"/>
22-
<element name="Italic" type="button" selector="button[title='Italic']"/>
23-
<element name="Underline" type="button" selector="button[title='Underline']"/>
24-
<element name="AlignLeft" type="button" selector="button[title='Align left']"/>
25-
<element name="AlignCenter" type="button" selector="button[title='Align center']"/>
26-
<element name="AlignRight" type="button" selector="button[title='Align right']"/>
27-
<element name="Bullet" type="button" selector="div[title='Bullet list']"/>
28-
<element name="Numlist" type="button" selector="div[title='Numbered list']"/>
29-
<element name="InsertLink" type="button" selector="button[title='Insert/edit link']"/>
30-
<element name="InsertTable" type="button" selector="button[title='Table']"/>
31-
<element name="SpecialCharacter" type="button" selector="button[title='Special character']"/>
19+
<element name="InsertImageIcon" type="button" selector="button[aria-label='Insert/edit image']" timeout="30"/>
20+
<element name="Style" type="button" selector="button[aria-label='Block Paragraph']"/>
21+
<element name="Bold" type="button" selector="button[aria-label='Bold']"/>
22+
<element name="Italic" type="button" selector="button[aria-label='Italic']"/>
23+
<element name="Underline" type="button" selector="button[aria-label='Underline']"/>
24+
<element name="AlignLeft" type="button" selector="button[aria-label='Align left']"/>
25+
<element name="AlignCenter" type="button" selector="button[aria-label='Align center']"/>
26+
<element name="AlignRight" type="button" selector="button[aria-label='Align right']"/>
27+
<element name="Bullet" type="button" selector="div[aria-label='Bullet list']"/>
28+
<element name="Numlist" type="button" selector="div[aria-label='Numbered list']"/>
29+
<element name="InsertLink" type="button" selector="button[aria-label='Insert/edit link']"/>
30+
<element name="InsertTable" type="button" selector="button[aria-label='Table']"/>
31+
<element name="SpecialCharacter" type="button" selector="button[aria-label='Special character']"/>
3232
<element name="WidgetButton" type="button" selector="span[class*='magento-widget mceNonEditable']"/>
3333
<element name="EditorContent" type="input" selector="#tinymce"/>
3434
<element name="Content" type="textarea" selector="textarea"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddRecentlyViewedProductWidgetToSeeProductPriceTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
3535
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
3636
<waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCE"/>
37-
<executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
37+
<executeJS function="hugerte.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
3838
<seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
3939
<click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
4040
<waitForPageLoad stepKey="waitForPageLoad" />

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
3636
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
3737
<waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCE"/>
38-
<executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
38+
<executeJS function="hugerte.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
3939
<seeElement selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="seeInsertVariableIcon" />
4040
<click selector="{{TinyMCESection.InsertVariableIcon}}" stepKey="clickInsertVariableIcon1" />
4141
<waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
2929
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
3030
<waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCE"/>
31-
<executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
31+
<executeJS function="hugerte.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
3232
<seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
3333
<click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
3434
<waitForPageLoad stepKey="wait2"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
3030
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
3131
<waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCE"/>
32-
<executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
32+
<executeJS function="hugerte.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
3333
<seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
3434
<click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
3535
<waitForPageLoad stepKey="waitForPageLoad" />

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
3030
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
3131
<waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCE"/>
32-
<executeJS function="tinyMCE.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
32+
<executeJS function="hugerte.activeEditor.setContent('Hello CMS Page!');" stepKey="executeJSFillContent"/>
3333
<seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
3434
<click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
3535
<waitForPageLoad stepKey="wait2"/>

0 commit comments

Comments
 (0)