Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/frontend/blob_edit/blob_bundle_spec.js b/spec/frontend/blob_edit/blob_bundle_spec.js
index a105b62586b..eecc54be35b 100644
--- a/spec/frontend/blob_edit/blob_bundle_spec.js
+++ b/spec/frontend/blob_edit/blob_bundle_spec.js
@@ -1,10 +1,25 @@
 import $ from 'jquery';
 import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
+import waitForPromises from 'helpers/wait_for_promises';
 import blobBundle from '~/blob_edit/blob_bundle';
 
+import EditorLite from '~/blob_edit/edit_blob';
+
 jest.mock('~/blob_edit/edit_blob');
 
 describe('BlobBundle', () => {
+  it('does not load EditorLite by default', () => {
+    blobBundle();
+    expect(EditorLite).not.toHaveBeenCalled();
+  });
+
+  it('loads EditorLite for the edit screen', async () => {
+    setFixtures(`<div class="js-edit-blob-form"></div>`);
+    blobBundle();
+    await waitForPromises();
+    expect(EditorLite).toHaveBeenCalled();
+  });
+
   describe('No Suggest Popover', () => {
     beforeEach(() => {
       setFixtures(`