Add latest changes from gitlab-org/gitlab@master

1 files changed, 29 insertions, 20 deletions

diff --git a/spec/frontend_integration/content_editor/content_editor_integration_spec.js b/spec/frontend_integration/content_editor/content_editor_integration_spec.js
index 89b8d8d6d94..4d400a383e3 100644
--- a/spec/frontend_integration/content_editor/content_editor_integration_spec.js
+++ b/spec/frontend_integration/content_editor/content_editor_integration_spec.js
@@ -61,29 +61,38 @@ describe('content_editor', () => {
     });
   });
 
-  it('renders footnote ids alongside the footnote definition', async () => {
-    buildWrapper();
-
-    renderMarkdown.mockResolvedValue(`
-    <p data-sourcepos="3:1-3:56" dir="auto">
-      This reference tag is a mix of letters and numbers. <sup class="footnote-ref"><a href="#fn-footnote-2717" id="fnref-footnote-2717" data-footnote-ref="">2</a></sup>
-    </p>
-    <section class="footnotes" data-footnotes>
-      <ol>
-        <li id="fn-footnote-2717">
-        <p data-sourcepos="6:7-6:31">This is another footnote. <a href="#fnref-footnote-2717" aria-label="Back to content" class="footnote-backref" data-footnote-backref=""><gl-emoji title="leftwards arrow with hook" data-name="leftwards_arrow_with_hook" data-unicode-version="1.1">↩</gl-emoji></a></p>
-        </li>
-      </ol>
-    </section>
-    `);
+  describe('when preserveUnchangedMarkdown feature flag is enabled', () => {
+    beforeEach(() => {
+      gon.features = { preserveUnchangedMarkdown: true };
+    });
+    afterEach(() => {
+      gon.features = { preserveUnchangedMarkdown: false };
+    });
 
-    await contentEditorService.setSerializedContent(`
-    This reference tag is a mix of letters and numbers [^footnote].
+    it('processes and renders footnote ids alongside the footnote definition', async () => {
+      buildWrapper();
 
-    [^footnote]: This is another footnote.
+      await contentEditorService.setSerializedContent(`
+This reference tag is a mix of letters and numbers [^footnote].
+
+[^footnote]: This is another footnote.
     `);
-    await nextTick();
+      await nextTick();
+
+      expect(wrapper.text()).toContain('footnote: This is another footnote');
+    });
+
+    it('processes and displays reference definitions', async () => {
+      buildWrapper();
+
+      await contentEditorService.setSerializedContent(`
+[GitLab][gitlab]
 
-    expect(wrapper.text()).toContain('footnote: This is another footnote');
+[gitlab]: https://gitlab.com
+      `);
+      await nextTick();
+
+      expect(wrapper.find('pre').text()).toContain('[gitlab]: https://gitlab.com');
+    });
   });
 });