Fix file content if it is empty
If the file content was empty it would throw a null.
Fix this by using a empty string instead of it using null.
Bug: Issue 8056
Change-Id: I897ba5b60e6239d6582b8b502a72718a472e9e3e
diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.js b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.js
index 447c258..e2d368f 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.js
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.js
@@ -114,9 +114,9 @@
return this.$.restAPI.getFileInChangeEdit(changeNum, path).then(res => {
if (!res.ok) { return; }
- this._type = res.type;
- this._newContent = res.content;
- this._content = res.content;
+ this._type = res.type || '';
+ this._newContent = res.content || '';
+ this._content = res.content || '';
});
},
diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.html b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.html
index fa9bcec..ab18494 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.html
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.html
@@ -226,6 +226,33 @@
assert.equal(element._type, 'initial');
});
});
+
+ test('content is undefined', () => {
+ sandbox.stub(element.$.restAPI, 'getFileInChangeEdit')
+ .returns(Promise.resolve({
+ ok: true,
+ type: 'text/javascript',
+ }));
+
+ return element._getFileData('1', 'test/path').then(() => {
+ assert.equal(element._newContent, '');
+ assert.equal(element._content, '');
+ assert.equal(element._type, 'text/javascript');
+ });
+ });
+
+ test('content and type is undefined', () => {
+ sandbox.stub(element.$.restAPI, 'getFileInChangeEdit')
+ .returns(Promise.resolve({
+ ok: true,
+ }));
+
+ return element._getFileData('1', 'test/path').then(() => {
+ assert.equal(element._newContent, '');
+ assert.equal(element._content, '');
+ assert.equal(element._type, '');
+ });
+ });
});
});
-</script>
\ No newline at end of file
+</script>
