Skip to content

Commit 7609f85

Browse files
kieuphan2406kieuphan2406
committed
MC-3308: Automate MFTF for MC-1416
1 parent 14f21f7 commit 7609f85

File tree

4 files changed

+332
-7
lines changed

4 files changed

+332
-7
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
<waitForElementVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForInsertVariable2"/>
3636
<click selector="{{VariableSection.InsertWidget}}" stepKey="clickInsertVariable2"/>
3737
<waitForElementNotVisible selector="{{VariableSection.InsertWidget}}" stepKey="waitForVariableModalToClose"/>
38-
<switchToIFrame selector="{{TextOnConfiguration.tinyMCEIFrame}}" stepKey="switchToIFrame"/>
39-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCEVariable(variable.editPanelValue, '1')}}" stepKey="waitForVariable2"/>
40-
<switchToIFrame stepKey="exitIFrame"/>
4138
</actionGroup>
4239
<actionGroup name="addPageLinkVariableWYSIWYGDisabled">
4340
<arguments>
@@ -84,9 +81,6 @@
8481
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget2"/>
8582
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear5"/>
8683
<waitForElementNotVisible selector="{{WidgetSection.InsertWidget}}" stepKey="waitForInsertWidgetModalToClose"/>
87-
<switchToIFrame selector="{{TextOnConfiguration.tinyMCEIFrame}}" stepKey="switchToIFrame"/>
88-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCEWidget(widget.editPanelValue, '1')}}" stepKey="waitForWidget"/>
89-
<switchToIFrame stepKey="exitIFrame"/>
9084
</actionGroup>
9185
<actionGroup name="addPageLinkWidgetWYSIWYGDisabled">
9286
<arguments>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<element name="noMargins" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[not(contains(@style,'margin:'))]" parameterized="true"/>
3030
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
3131
<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"/>
3234
</section>
3335
<section name="TextOnConfiguration">
3436
<!-- WYSIWYG Enabled -->
@@ -48,7 +50,7 @@
4850
<element name="textAreaText" type="text" selector="(//div[@data-role='text'])[{{arg1}}][.='{{arg2}}']" parameterized="true"/>
4951
<element name="textAreaWidget" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
5052
<element name="textAreaVariable" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
51-
<element name="text" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//p[.='{{arg2}}']" parameterized="true"/>
53+
<element name="text" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//p[contains(text(),'{{arg2}}')]" parameterized="true"/>
5254
<!-- Advanced Configuration -->
5355
<element name="alignment" type="text" selector="(//div[@data-role='text'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
5456
<element name="noAlignment" type="text" selector="(//div[@data-role='text'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -66,6 +68,7 @@
6668
<element name="noMargins" type="text" selector="(//div[@data-role='text'])[{{arg1}}][not(contains(@style,'margin:'))]" parameterized="true"/>
6769
<element name="padding" type="text" selector="(//div[@data-role='text'])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
6870
<element name="noPadding" type="text" selector="(//div[@data-role='text'])[{{arg1}}][not(contains(@style,'padding:'))]" parameterized="true"/>
71+
<element name="empty" type="text" selector="//div[@data-role='text'][{{arg1}}][not(*)]" parameterized="true"/>
6972
</section>
7073
<section name="TextOnBackend">
7174
<element name="textInstance" type="button" selector='//div[contains(@class, "pagebuilder-text")][1]/div[1]'/>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,12 +1357,22 @@
13571357
<actionGroup ref="addVariableToTinyMCE" stepKey="addVariableToTinyMCE">
13581358
<argument name="variable" value="TinyMCEVariableCountry"/>
13591359
</actionGroup>
1360+
<!--Switch to iFrame 1-->
1361+
<comment userInput="Switch to iFrame" stepKey="commentSwitchToIFrame1"/>
1362+
<switchToIFrame selector="{{TextOnConfiguration.tinyMCEIFrame}}" stepKey="switchToIFrame1"/>
1363+
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCEVariable(TinyMCEVariableBaseURL.editPanelValue, '1')}}" stepKey="waitForVariable2"/>
1364+
<switchToIFrame stepKey="exitIFrame1"/>
13601365
<!--Add variable into Text content-->
13611366
<comment userInput="Add widget into Text content" stepKey="addWidgetIntoTextContent"/>
13621367
<actionGroup ref="addPageLinkWidgetToTinyMCE" stepKey="addPageLinkWidgetToTinyMCE">
13631368
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
13641369
<argument name="page" value="$$createCMSPageB.identifier$$"/>
13651370
</actionGroup>
1371+
<!--Switch to iFrame-->
1372+
<comment userInput="Switch to iFrame" stepKey="commentSwitchToIFrame"/>
1373+
<switchToIFrame selector="{{TextOnConfiguration.tinyMCEIFrame}}" stepKey="switchToIFrame"/>
1374+
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCEWidget(TinyMCEWidgetCMSPageLink.editPanelValue, '1')}}" stepKey="waitForWidget"/>
1375+
<switchToIFrame stepKey="exitIFrame"/>
13661376
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
13671377
<waitForElementVisible time="5" selector="{{PageBuilderStage.exitFullScreen}}" stepKey="waitForExitFullScreen" />
13681378
<click selector="{{PageBuilderStage.exitFullScreen}}" stepKey="exitPageBuilderFullScreen" />
@@ -1460,12 +1470,22 @@
14601470
<actionGroup ref="addVariableToTinyMCE" stepKey="addVariableToTinyMCE">
14611471
<argument name="variable" value="TinyMCEVariableCountry"/>
14621472
</actionGroup>
1473+
<!--Switch to iFrame 1-->
1474+
<comment userInput="Switch to iFrame" stepKey="commentSwitchToIFrame1"/>
1475+
<switchToIFrame selector="{{TextOnConfiguration.tinyMCEIFrame}}" stepKey="switchToIFrame1"/>
1476+
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCEVariable(TinyMCEVariableBaseURL.editPanelValue, '1')}}" stepKey="waitForVariable2"/>
1477+
<switchToIFrame stepKey="exitIFrame1"/>
14631478
<!--Add widget to PageBuilder-->
14641479
<comment userInput="Add widget to PageBuilder" stepKey="addWidgetToPageBuilder"/>
14651480
<actionGroup ref="addPageLinkWidgetToTinyMCE" stepKey="addPageLinkWidgetToTinyMCE">
14661481
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>
14671482
<argument name="page" value="$$createCMSPageB.identifier$$"/>
14681483
</actionGroup>
1484+
<!--Switch to iFrame-->
1485+
<comment userInput="Switch to iFrame" stepKey="commentSwitchToIFrame"/>
1486+
<switchToIFrame selector="{{TextOnConfiguration.tinyMCEIFrame}}" stepKey="switchToIFrame"/>
1487+
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCEWidget(TinyMCEWidgetCMSPageLink.editPanelValue, '1')}}" stepKey="waitForWidget"/>
1488+
<switchToIFrame stepKey="exitIFrame"/>
14691489
<click selector="{{EditPanelForm.editFormSave}}" stepKey="clickSaveColumn"/>
14701490
<waitForElementNotVisible time="5" selector="{{EditPanelForm.editForm}}" stepKey="waitForEditFormNotVisible" />
14711491
<waitForElementVisible time="5" selector="{{PageBuilderStage.exitFullScreen}}" stepKey="waitForExitFullScreen" />

0 commit comments

Comments
 (0)