diff options
author | Jarka Kadlecova <jarka@gitlab.com> | 2017-07-26 09:57:56 +0200 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-08-11 16:56:22 +0200 |
commit | de6e029ee8788ef6f66678097fbfbae27ea2fd5f (patch) | |
tree | 141684beb6123bfe8d591685acabc55773903bc4 | |
parent | 2c79d921f99430a96ed8ebfb0a0cd3387ac39512 (diff) | |
download | gitlab-ce-fix-jenkins-error.tar.gz |
Fix displaying specific error message when Jenkins test failsfix-jenkins-error
-rw-r--r-- | app/assets/javascripts/integrations/integration_settings_form.js | 2 | ||||
-rw-r--r-- | spec/javascripts/integrations/integration_settings_form_spec.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/integrations/integration_settings_form.js b/app/assets/javascripts/integrations/integration_settings_form.js index ddd3a6aab99..cf1e6a14725 100644 --- a/app/assets/javascripts/integrations/integration_settings_form.js +++ b/app/assets/javascripts/integrations/integration_settings_form.js @@ -102,7 +102,7 @@ export default class IntegrationSettingsForm { }) .done((res) => { if (res.error) { - new Flash(res.message, null, null, { + new Flash(`${res.message} ${res.service_response}`, null, null, { title: 'Save anyway', clickHandler: (e) => { e.preventDefault(); diff --git a/spec/javascripts/integrations/integration_settings_form_spec.js b/spec/javascripts/integrations/integration_settings_form_spec.js index 45909d4e70e..3daeb91b1e2 100644 --- a/spec/javascripts/integrations/integration_settings_form_spec.js +++ b/spec/javascripts/integrations/integration_settings_form_spec.js @@ -135,10 +135,10 @@ describe('IntegrationSettingsForm', () => { integrationSettingsForm.testSettings(formData); - deferred.resolve({ error: true, message: errorMessage }); + deferred.resolve({ error: true, message: errorMessage, service_response: 'some error' }); const $flashContainer = $('.flash-container'); - expect($flashContainer.find('.flash-text').text()).toEqual(errorMessage); + expect($flashContainer.find('.flash-text').text()).toEqual('Test failed. some error'); expect($flashContainer.find('.flash-action')).toBeDefined(); expect($flashContainer.find('.flash-action').text()).toEqual('Save anyway'); }); |