Merge branch 'sh-improve-import-status-error' into 'master'

Show a more helpful error for import status

Closes #47365

See merge request gitlab-org/gitlab-ce!19467

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/javascripts/importer_status_spec.js b/spec/javascripts/importer_status_spec.js
index 87b46ccf7c3..63cdb3d5114 100644
--- a/spec/javascripts/importer_status_spec.js
+++ b/spec/javascripts/importer_status_spec.js
@@ -50,6 +50,24 @@ describe('Importer Status', () => {
       })
       .catch(done.fail);
     });
+
+    it('shows error message after failed POST request', (done) => {
+      appendSetFixtures('<div class="flash-container"></div>');
+
+      mock.onPost(importUrl).reply(422, {
+        errors: 'You forgot your lunch',
+      });
+
+      instance.addToImport({
+        currentTarget: document.querySelector('.js-add-to-import'),
+      })
+      .then(() => {
+        const flashMessage = document.querySelector('.flash-text');
+        expect(flashMessage.textContent.trim()).toEqual('An error occurred while importing project: You forgot your lunch');
+        done();
+      })
+      .catch(done.fail);
+    });
   });
 
   describe('autoUpdate', () => {