opendev/gerrit
Code Issues Proposed changes

Merge "Gracefully handle HTTP 409 for diff API"

Browse Source
This commit is contained in:
Andrew Bonventre
2016-10-13 18:57:29 +00:00
committed by Gerrit Code Review
parent 75d10d3d93 1be7c31e66
commit f12ad4cf94
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js
View File

@@ -375,6 +375,12 @@
},
_handleGetDiffError: function(response) {
// Loading the diff may respond with 409 if the file is too large. In this
// case, use a toast error..
if (response.status === 409) {
this.fire('server-error', {response: response});
return;
}
this.fire('page-error', {response: response});
},
@@ -386,8 +392,8 @@
this.path,
this._handleGetDiffError.bind(this)).then(function(diff) {
this.filesWeblinks = {
meta_a: diff.meta_a && diff.meta_a.web_links,
meta_b: diff.meta_b && diff.meta_b.web_links,
meta_a: diff && diff.meta_a && diff.meta_a.web_links,
meta_b: diff && diff.meta_b && diff.meta_b.web_links,
};
return diff;
}.bind(this));

10
polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.html
View File

@@ -327,6 +327,16 @@ limitations under the License.
});
content.click();
});
test('_getDiff handles null diff responses', function(done) {
stub('gr-rest-api-interface', {
getDiff: function() { return Promise.resolve(null); },
});
element.changeNum = 123;
element.patchRange = {basePatchNum: 1, patchNum: 2};
element.path = 'file.txt';
element._getDiff().then(done);
});
});
suite('logged in', function() {