Skip to content

Commit 3438b3b

Browse files
committed
MC-23058: Template strict mode is not set for unsaved template previews
1 parent 84dff07 commit 3438b3b

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminNewsletterTemplateActionGroup.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,25 @@
3131
</actionGroup>
3232

3333
<actionGroup name="OpenNewsletterPreviewTab">
34-
<waitForElementVisible selector="{{BasicFieldNewsletterSection.templateName}}" stepKey="waitForPreviewButton"/>
34+
<annotations>
35+
<description>Open the currently drafted newletter in new tab preview mode. The JS is required due to the sandboxed iframe not playing nicely with selenium.</description>
36+
</annotations>
37+
<waitForElementVisible selector="{{BasicFieldNewsletterSection.preview}}" stepKey="waitForPreviewButton"/>
3538
<click selector="{{BasicFieldNewsletterSection.preview}}" stepKey="clickPreview"/>
3639
<switchToNextTab stepKey="switchToPreviewTab"/>
3740
<waitForPageLoad stepKey="waitForTabLoaded"/>
3841
<waitForElementVisible selector="{{BasicFieldNewsletterSection.previewIframe}}" stepKey="waitForIframeVisible"/>
39-
<waitForJS function="return document.getElementById('preview_iframe').sandbox.add('allow-scripts') || true" stepKey="removeSandboxValues"/>
42+
<waitForJS function="return document.getElementById('preview_iframe').sandbox.add('allow-scripts') || true" stepKey="addSandboxValue"/>
4043
</actionGroup>
4144

4245
<actionGroup name="AssertNewsletterContent">
46+
<annotations>
47+
<description>Validate the content of the newsletter preview tab that is open. JS is used due to strange behaviors with selenium and the posted form sandboxed iframe containing the text.</description>
48+
</annotations>
4349
<arguments>
4450
<argument name="Newsletter" defaultValue="BasicFieldNewsletterSection"/>
4551
</arguments>
46-
<executeJS function="return document.getElementById('preview_iframe').contentDocument.body.textContent" stepKey="grabTemplateText"/>
52+
<waitForJS function="return document.getElementById('preview_iframe').contentDocument.body.textContent" stepKey="grabTemplateText"/>
4753
<assertContains stepKey="checkTemplateContainsText">
4854
<actualResult type="variable">grabTemplateText</actualResult>
4955
<expectedResult type="string">{{Newsletter.expectedTemplate}}</expectedResult>

0 commit comments

Comments
 (0)