Skip to content

Commit 84dff07

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

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,19 @@
3434
<waitForElementVisible selector="{{BasicFieldNewsletterSection.templateName}}" stepKey="waitForPreviewButton"/>
3535
<click selector="{{BasicFieldNewsletterSection.preview}}" stepKey="clickPreview"/>
3636
<switchToNextTab stepKey="switchToPreviewTab"/>
37+
<waitForPageLoad stepKey="waitForTabLoaded"/>
3738
<waitForElementVisible selector="{{BasicFieldNewsletterSection.previewIframe}}" stepKey="waitForIframeVisible"/>
38-
<executeJS function="Array.from(document.getElementById('preview_iframe').sandbox.values()).map(document.getElementById('preview_iframe').sandbox.remove)" stepKey="removeSandboxValues"/>
39-
<switchToIFrame userInput="preview_iframe" stepKey="switchToIframe"/>
40-
<waitForPageLoad stepKey="waitForPreviewIframeLoaded"/>
39+
<waitForJS function="return document.getElementById('preview_iframe').sandbox.add('allow-scripts') || true" stepKey="removeSandboxValues"/>
4140
</actionGroup>
4241

4342
<actionGroup name="AssertNewsletterContent">
4443
<arguments>
4544
<argument name="Newsletter" defaultValue="BasicFieldNewsletterSection"/>
4645
</arguments>
47-
<waitForText userInput="{{Newsletter.expectedTemplate}}" stepKey="checkTemplateContainsText"/>
46+
<executeJS function="return document.getElementById('preview_iframe').contentDocument.body.textContent" stepKey="grabTemplateText"/>
47+
<assertContains stepKey="checkTemplateContainsText">
48+
<actualResult type="variable">grabTemplateText</actualResult>
49+
<expectedResult type="string">{{Newsletter.expectedTemplate}}</expectedResult>
50+
</assertContains>
4851
</actionGroup>
49-
5052
</actionGroups>

0 commit comments

Comments
 (0)