Skip to content
Snippets Groups Projects
Commit 65b49c56 authored by Ugo Albanese's avatar Ugo Albanese Committed by Viktor Vorobev
Browse files

Merged in error_handlers_fix (pull request #333)

[NRRPLT-8868] Display backend error message instead of default

* [NRRPLT-8868] Display backend error message instead of default


Approved-by: Viktor Vorobev
parent e053dcc5
No related branches found
No related tags found
No related merge requests found
......@@ -52,7 +52,7 @@
var NrpError = function() {
this.title = 'Error';
this.label = 'OK';
this.message = 'An error occured. Please try again later.';
this.message = 'An error occurred. Please try again later.';
};
return {
getBasicError: function() {
......@@ -199,6 +199,7 @@
var errorSource = response.data;
if (keepErrorMessage) {
// human_readable === response.data.message, seems useless
nrpError.message = response.human_readable;
}
if (errorSource) {
......@@ -207,13 +208,13 @@
nrpError.data = errorSource.data;
}
if (errorSource.message) {
nrpError.message = errorSource.message;
if (
errorSource.message.toLowerCase().indexOf('recoverable') !== -1
) {
/// failure is presumably a Xvfb_Xvn_Error
nrpError.message = 'Job allocation failed. Please try again.';
}
if (
} else if (
errorSource.message
.toLowerCase()
.indexOf('no resources available') !== -1
......
......@@ -258,7 +258,7 @@ describe('Services: nrp-error-handlers', function() {
expect(nrpErrorDialog.open.calls.count()).toBe(1);
expect(nrpErrorDialog.open.calls.mostRecent().args[0].message).toBe(
'error template'
'This is a serious error'
);
expect(nrpErrorService.httpError).toHaveBeenCalledWith(response);
expect(nrpErrorService.httpError.calls.count()).toBe(1);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment