Add latest changes from gitlab-org/gitlab@13-3-stable-ee

2 files changed, 11 insertions, 1 deletions

diff --git a/spec/frontend/behaviors/copy_as_gfm_spec.js b/spec/frontend/behaviors/copy_as_gfm_spec.js
index 33af9bc135e..46d4451c941 100644
--- a/spec/frontend/behaviors/copy_as_gfm_spec.js
+++ b/spec/frontend/behaviors/copy_as_gfm_spec.js
@@ -123,4 +123,14 @@ describe('CopyAsGFM', () => {
       });
     });
   });
+
+  describe('CopyAsGFM.quoted', () => {
+    const sampleGFM = '* List 1\n* List 2\n\n`Some code`';
+
+    it('adds quote char `> ` to each line', done => {
+      const expectedQuotedGFM = '> * List 1\n> * List 2\n> \n> `Some code`';
+      expect(CopyAsGFM.quoted(sampleGFM)).toEqual(expectedQuotedGFM);
+      done();
+    });
+  });
 });
diff --git a/spec/frontend/behaviors/gl_emoji_spec.js b/spec/frontend/behaviors/gl_emoji_spec.js
index 7ea0bafc328..ef6b1673b7c 100644
--- a/spec/frontend/behaviors/gl_emoji_spec.js
+++ b/spec/frontend/behaviors/gl_emoji_spec.js
@@ -1,10 +1,10 @@
 import MockAdapter from 'axios-mock-adapter';
+import waitForPromises from 'jest/helpers/wait_for_promises';
 import axios from '~/lib/utils/axios_utils';
 import { initEmojiMap, EMOJI_VERSION } from '~/emoji';
 import installGlEmojiElement from '~/behaviors/gl_emoji';
 
 import * as EmojiUnicodeSupport from '~/emoji/support';
-import waitForPromises from 'jest/helpers/wait_for_promises';
 
 jest.mock('~/emoji/support');