Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/frontend/blob_edit/blob_bundle_spec.js b/spec/frontend/blob_edit/blob_bundle_spec.js
index 644539308c2..ed42322b0e6 100644
--- a/spec/frontend/blob_edit/blob_bundle_spec.js
+++ b/spec/frontend/blob_edit/blob_bundle_spec.js
@@ -5,8 +5,10 @@ import waitForPromises from 'helpers/wait_for_promises';
 import blobBundle from '~/blob_edit/blob_bundle';
 
 import SourceEditor from '~/blob_edit/edit_blob';
+import { createAlert } from '~/flash';
 
 jest.mock('~/blob_edit/edit_blob');
+jest.mock('~/flash');
 
 describe('BlobBundle', () => {
   it('does not load SourceEditor by default', () => {
@@ -93,4 +95,26 @@ describe('BlobBundle', () => {
       });
     });
   });
+
+  describe('Error handling', () => {
+    let message;
+    beforeEach(() => {
+      setHTMLFixture(`<div class="js-edit-blob-form" data-blob-filename="blah"></div>`);
+      message = 'Foo';
+      SourceEditor.mockImplementation(() => {
+        throw new Error(message);
+      });
+    });
+
+    afterEach(() => {
+      resetHTMLFixture();
+      SourceEditor.mockClear();
+    });
+
+    it('correctly outputs error message when it occurs', async () => {
+      blobBundle();
+      await waitForPromises();
+      expect(createAlert).toHaveBeenCalledWith({ message });
+    });
+  });
 });