Skip to content

Commit de61a63

Browse files
authored
Merge pull request #202 from magento-obsessive-owls/revert-merge-of-1.0.0-release-into-1.0.0-beta-release
Revert "Merge branch '1.0.0-release' into 1.0.0-beta-release"
2 parents 3cac900 + a663a41 commit de61a63

File tree

2 files changed

+0
-47
lines changed

2 files changed

+0
-47
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<element name="textareaPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@class, 'inline-wysiwyg-textarea') and contains(@placeholder,'Edit Text')]" parameterized="true"/>
2424
<element name="textPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
2525
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
26-
<element name="tinymceFocused" type="text" selector="(//div[contains(@class, 'pagebuilder-text') and contains(@class, 'pagebuilder-toolbar-active')])[{{arg}}]" parameterized="true"/>
2726
<element name="importantStyle" type="text" selector="//span[text()='Important']"/>
2827
<element name="textInImportantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(normalize-space(@class), 'cms-content-important') and text()='{{arg2}}']" parameterized="true"/>
2928
<element name="emptyTextInImportantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(normalize-space(@class), 'cms-content-important')]" parameterized="true"/>

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

-46
Original file line numberDiff line numberDiff line change
@@ -2647,50 +2647,4 @@
26472647
<actualResult type="variable">grabComputedTextAlignStoreFront</actualResult>
26482648
</assertEquals>
26492649
</test>
2650-
<test name="InlineTinyMceEditingIsNotFocusedOnEditSave">
2651-
<annotations>
2652-
<features value="PageBuilder"/>
2653-
<stories value="Text"/>
2654-
<title value="TinyMCE should not be incorrectly focused"/>
2655-
<description value="Verify the inline editing mode for TinyMCE isn't focused automatically when saving content within the edit panel"/>
2656-
<severity value="MAJOR"/>
2657-
<useCaseId value="MC-3812"/>
2658-
<testCaseId value="MC-5728"/>
2659-
<group value="pagebuilder"/>
2660-
<group value="pagebuilder-text"/>
2661-
</annotations>
2662-
<before>
2663-
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2664-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2665-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
2666-
</before>
2667-
<after>
2668-
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
2669-
<actionGroup ref="logout" stepKey="logout"/>
2670-
</after>
2671-
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
2672-
<argument name="CMSPage" value="$$createCMSPage$$"/>
2673-
</actionGroup>
2674-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup1">
2675-
<argument name="group" value="PageBuilderTextContentType"/>
2676-
</actionGroup>
2677-
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
2678-
<argument name="contentType" value="PageBuilderTextContentType"/>
2679-
</actionGroup>
2680-
<!-- Drag text into stage -->
2681-
<comment userInput="Drag text into stage" stepKey="commentDragTextIntoStage"/>
2682-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
2683-
<seeElement selector="{{TextOnStage.tinymceFocused('1')}}" stepKey="seeFocusedTinyMce"/>
2684-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromWYSIWYG1"/>
2685-
<dontSeeElement selector="{{TextOnStage.tinymceFocused('1')}}" stepKey="dontSeeFocusedTinyMce"/>
2686-
<!-- Open and save slide out panel -->
2687-
<comment userInput="Open and save slide out panel" stepKey="commentOpenAndSaveSlideOut"/>
2688-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
2689-
<argument name="contentType" value="PageBuilderTextContentType"/>
2690-
</actionGroup>
2691-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
2692-
<!-- Verify TinyMCE is not automatically focused -->
2693-
<comment userInput="Verify TinyMCE is not automatically focused" stepKey="commentVerifyNotFocused"/>
2694-
<dontSeeElement selector="{{TextOnStage.tinymceFocused('1')}}" stepKey="dontSeeTinyMceFocused"/>
2695-
</test>
26962650
</tests>

0 commit comments

Comments
 (0)