Add latest changes from gitlab-org/gitlab@master

4 files changed, 36 insertions, 2 deletions

diff --git a/spec/frontend/__mocks__/@gitlab/ui.js b/spec/frontend/__mocks__/@gitlab/ui.js
index a4f10aae13b..4d893bcd0bd 100644
--- a/spec/frontend/__mocks__/@gitlab/ui.js
+++ b/spec/frontend/__mocks__/@gitlab/ui.js
@@ -50,6 +50,7 @@ jest.mock('@gitlab/ui/dist/components/base/popover/popover.js', () => ({
         'container',
         'showCloseButton',
         'show',
+        'boundaryPadding',
       ].map((prop) => [prop, {}]),
     ),
   },
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 });
+    });
+  });
 });
diff --git a/spec/frontend/import_entities/import_projects/store/mutations_spec.js b/spec/frontend/import_entities/import_projects/store/mutations_spec.js
index 16c6d74d1e8..d96846f6374 100644
--- a/spec/frontend/import_entities/import_projects/store/mutations_spec.js
+++ b/spec/frontend/import_entities/import_projects/store/mutations_spec.js
@@ -27,7 +27,12 @@ describe('import_projects store mutations', () => {
       state = {
         filter: 'some-value',
         repositories: ['some', ' repositories'],
-        pageInfo: { page: 1 },
+        pageInfo: {
+          page: 1,
+          startCursor: 'Y3Vyc30yOjI2',
+          endCursor: 'Y3Vyc29yOjI1',
+          hasNextPage: false,
+        },
       };
       mutations[types.SET_FILTER](state, NEW_VALUE);
     });
@@ -36,8 +41,11 @@ describe('import_projects store mutations', () => {
       expect(state.repositories.length).toBe(0);
     });
 
-    it('resets current page to 0', () => {
+    it('resets pagintation', () => {
       expect(state.pageInfo.page).toBe(0);
+      expect(state.pageInfo.startCursor).toBe(null);
+      expect(state.pageInfo.endCursor).toBe(null);
+      expect(state.pageInfo.hasNextPage).toBe(true);
     });
   });
 
diff --git a/spec/frontend/vue_shared/components/web_ide_link_spec.js b/spec/frontend/vue_shared/components/web_ide_link_spec.js
index 9f34d3e947b..3b0f0fe6e73 100644
--- a/spec/frontend/vue_shared/components/web_ide_link_spec.js
+++ b/spec/frontend/vue_shared/components/web_ide_link_spec.js
@@ -463,6 +463,7 @@ describe('Web IDE link component', () => {
             showCloseButton: '',
             target: 'web-ide-link',
             triggers: 'manual',
+            boundaryPadding: 80,
           }),
         );
       });