Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 1 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 c0c6b5e5dc8..2fa491196ff 100644
--- a/spec/frontend_integration/content_editor/content_editor_integration_spec.js
+++ b/spec/frontend_integration/content_editor/content_editor_integration_spec.js
@@ -12,13 +12,16 @@ describe('content_editor', () => {
   let wrapper;
   let renderMarkdown;
 
-  const buildWrapper = ({ markdown = '' } = {}) => {
+  const buildWrapper = ({ markdown = '', listeners = {} } = {}) => {
     wrapper = mountExtended(ContentEditor, {
       propsData: {
         renderMarkdown,
         uploadsPath: '/',
         markdown,
       },
+      listeners: {
+        ...listeners,
+      },
     });
   };
 
@@ -35,6 +38,10 @@ describe('content_editor', () => {
     renderMarkdown = jest.fn();
   });
 
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
   describe('when loading initial content', () => {
     describe('when the initial content is empty', () => {
       it('still hides the loading indicator', async () => {
@@ -169,4 +176,16 @@ This reference tag is a mix of letters and numbers [^footnote].
       });
     });
   });
+
+  it('bubbles up the keydown event captured by ProseMirror', async () => {
+    const keydownHandler = jest.fn();
+
+    buildWrapper({ listeners: { keydown: keydownHandler } });
+
+    await waitUntilContentIsLoaded();
+
+    wrapper.find('[contenteditable]').trigger('keydown', {});
+
+    expect(wrapper.emitted('keydown')).toHaveLength(1);
+  });
 });