opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Fix `parent` in `gr-change-metadata` when there is no revision

Change-Id: I030f9cfa2fcd4606b83cd71de87abc42b203f66d
This commit is contained in:
David Pursehouse
2020-06-19 23:26:48 +09:00
parent ad273b556f d79946fd2a
commit 78942c0184
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.js
View File

@@ -126,7 +126,7 @@
_currentParents: {
type: Array,
computed: '_computeParents(revision)',
computed: '_computeParents(change, revision)',
},
/** @type {?} */
@@ -436,9 +436,11 @@
return null;
},
_computeParents(revision) {
_computeParents(change, revision) {
if (!revision || !revision.commit) {
return undefined;
if (!change || !change.current_revision) { return []; }
revision = change.revisions[change.current_revision];
if (!revision || !revision.commit) { return []; }
}
return revision.commit.parents;
},

36
polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_test.html
View File

@@ -417,20 +417,38 @@ limitations under the License.
});
test('_computeParents', () => {
const revision = {commit: {parents: [{commit: '123', subject: 'abc'}]}};
assert.isUndefined(element._computeParents({}));
assert.equal(element._computeParents(revision), revision.commit.parents);
const parents = [{commit: '123', subject: 'abc'}];
const revision = {commit: {parents}};
assert.deepEqual(element._computeParents({}, {}), []);
assert.equal(element._computeParents(null, revision), parents);
const change = current_revision => {
return {current_revision, revisions: {456: revision}};
};
assert.deepEqual(element._computeParents(change(null), null), []);
const change_bad_revision = change('789');
assert.deepEqual(element._computeParents(change_bad_revision, {}), []);
const change_no_commit = {current_revision: '456', revisions: {456: {}}};
assert.deepEqual(element._computeParents(change_no_commit, null), []);
const change_good = change('456');
assert.equal(element._computeParents(change_good, null), parents);
});
test('_currentParents', () => {
element.revision = {
commit: {parents: [{commit: '123', subject: 'abc'}]},
const revision = parent => {
return {commit: {parents: [{commit: parent, subject: 'abc'}]}};
};
assert.equal(element._currentParents[0].commit, '123');
element.revision = {
commit: {parents: [{commit: '12345', subject: 'abc'}]},
element.change = {
current_revision: '456',
revisions: {456: revision('111')},
};
assert.equal(element._currentParents[0].commit, '12345');
element.revision = revision('222');
assert.equal(element._currentParents[0].commit, '222');
element.revision = revision('333');
assert.equal(element._currentParents[0].commit, '333');
element.revision = null;
assert.equal(element._currentParents[0].commit, '111');
element.change = {current_revision: null};
assert.deepEqual(element._currentParents, []);
});
test('_computeParentsLabel', () => {