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

2 files changed, 25 insertions, 8 deletions

diff --git a/spec/frontend/behaviors/autosize_spec.js b/spec/frontend/behaviors/autosize_spec.js
index 59abae479d4..3444c7b4075 100644
--- a/spec/frontend/behaviors/autosize_spec.js
+++ b/spec/frontend/behaviors/autosize_spec.js
@@ -1,20 +1,24 @@
-import $ from 'jquery';
 import '~/behaviors/autosize';
 
 function load() {
-  $(document).trigger('load');
+  document.dispatchEvent(new Event('DOMContentLoaded'));
 }
 
+jest.mock('~/helpers/startup_css_helper', () => {
+  return {
+    waitForCSSLoaded: jest.fn().mockImplementation(cb => cb.apply()),
+  };
+});
+
 describe('Autosize behavior', () => {
   beforeEach(() => {
-    setFixtures('<textarea class="js-autosize" style="resize: vertical"></textarea>');
+    setFixtures('<textarea class="js-autosize"></textarea>');
   });
 
-  it('does not overwrite the resize property', () => {
+  it('is applied to the textarea', () => {
     load();
 
-    expect($('textarea')).toHaveCss({
-      resize: 'vertical',
-    });
+    const textarea = document.querySelector('textarea');
+    expect(textarea.classList).toContain('js-autosize-initialized');
   });
 });
diff --git a/spec/frontend/behaviors/gl_emoji_spec.js b/spec/frontend/behaviors/gl_emoji_spec.js
index ef6b1673b7c..46b4e5d3d5c 100644
--- a/spec/frontend/behaviors/gl_emoji_spec.js
+++ b/spec/frontend/behaviors/gl_emoji_spec.js
@@ -10,7 +10,20 @@ jest.mock('~/emoji/support');
 
 describe('gl_emoji', () => {
   let mock;
-  const emojiData = getJSONFixture('emojis/emojis.json');
+  const emojiData = {
+    grey_question: {
+      c: 'symbols',
+      e: '❔',
+      d: 'white question mark ornament',
+      u: '6.0',
+    },
+    bomb: {
+      c: 'objects',
+      e: '💣',
+      d: 'bomb',
+      u: '6.0',
+    },
+  };
 
   beforeAll(() => {
     jest.spyOn(EmojiUnicodeSupport, 'default').mockReturnValue(true);