opendev/gerrit
Code Issues Proposed changes

Fix an outdated test

Browse Source 
Change-Id: I178b63bab5bfaf6ddf348804f33448c13dc38046
This commit is contained in:
Tao Zhou
2020-06-26 12:01:28 +02:00
parent b12ed923f6
commit 42402fa4b1
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
polygerrit-ui/app/elements/change/gr-confirm-revert-submission-dialog/gr-confirm-revert-submission-dialog.js
View File

@@ -65,6 +65,9 @@ class GrConfirmRevertSubmissionDialog extends GestureEventListeners(
} }
_populateRevertSubmissionMessage(message, change, changes) { _populateRevertSubmissionMessage(message, change, changes) {
if (change === undefined) {
return;
}
// Follow the same convention of the revert // Follow the same convention of the revert
const commitHash = change.current_revision; const commitHash = change.current_revision;
if (!commitHash) { if (!commitHash) {
@@ -79,12 +82,14 @@ class GrConfirmRevertSubmissionDialog extends GestureEventListeners(
this.changes = changes; this.changes = changes;
this.message = revertTitle + '\n\n' + this.message = revertTitle + '\n\n' +
'Reason for revert: <INSERT REASONING HERE>\n'; 'Reason for revert: <INSERT REASONING HERE>\n';
this.message += 'Reverted Changes:\n';
changes = changes || []; changes = changes || [];
changes.forEach(change => { if (changes.length) {
this.message += change.change_id.substring(0, 10) + ': ' + this.message += 'Reverted Changes:\n';
this._getTrimmedChangeSubject(change.subject) + '\n'; changes.forEach(change => {
}); this.message += change.change_id.substring(0, 10) + ': ' +
this._getTrimmedChangeSubject(change.subject) + '\n';
});
}
this.message = this._modifyRevertSubmissionMsg(change); this.message = this._modifyRevertSubmissionMsg(change);
} }

20
polygerrit-ui/app/elements/change/gr-confirm-revert-submission-dialog/gr-confirm-revert-submission-dialog_test.html
View File

@@ -41,7 +41,7 @@ suite('gr-confirm-revert-submission-dialog tests', () => {
setup(() => { setup(() => {
element = fixture('basic'); element = fixture('basic');
sandbox =sinon.sandbox.create(); sandbox = sinon.sandbox.create();
}); });
teardown(() => sandbox.restore()); teardown(() => sandbox.restore());
@@ -51,7 +51,7 @@ suite('gr-confirm-revert-submission-dialog tests', () => {
const alertStub = sandbox.stub(); const alertStub = sandbox.stub();
element.addEventListener('show-alert', alertStub); element.addEventListener('show-alert', alertStub);
element._populateRevertSubmissionMessage( element._populateRevertSubmissionMessage(
'not a commitHash in sight' 'not a commitHash in sight', {}
); );
assert.isTrue(alertStub.calledOnce); assert.isTrue(alertStub.calledOnce);
}); });
@@ -60,8 +60,8 @@ suite('gr-confirm-revert-submission-dialog tests', () => {
assert.isNotOk(element.message); assert.isNotOk(element.message);
element._populateRevertSubmissionMessage( element._populateRevertSubmissionMessage(
'one line commit\n\nChange-Id: abcdefg\n', 'one line commit\n\nChange-Id: abcdefg\n',
'abcd123'); {current_revision: 'abcd123', submission_id: '111'});
const expected = 'Revert submission\n\n' + const expected = 'Revert submission 111\n\n' +
'Reason for revert: <INSERT REASONING HERE>\n'; 'Reason for revert: <INSERT REASONING HERE>\n';
assert.equal(element.message, expected); assert.equal(element.message, expected);
}); });
@@ -70,8 +70,8 @@ suite('gr-confirm-revert-submission-dialog tests', () => {
assert.isNotOk(element.message); assert.isNotOk(element.message);
element._populateRevertSubmissionMessage( element._populateRevertSubmissionMessage(
'many lines\ncommit\n\nmessage\n\nChange-Id: abcdefg\n', 'many lines\ncommit\n\nmessage\n\nChange-Id: abcdefg\n',
'abcd123'); {current_revision: 'abcd123', submission_id: '111'});
const expected = 'Revert submission\n\n' + const expected = 'Revert submission 111\n\n' +
'Reason for revert: <INSERT REASONING HERE>\n'; 'Reason for revert: <INSERT REASONING HERE>\n';
assert.equal(element.message, expected); assert.equal(element.message, expected);
}); });
@@ -80,8 +80,8 @@ suite('gr-confirm-revert-submission-dialog tests', () => {
assert.isNotOk(element.message); assert.isNotOk(element.message);
element._populateRevertSubmissionMessage( element._populateRevertSubmissionMessage(
'test \nvery\n\ncommit\n\nBug: Issue 42\nChange-Id: abcdefg\n', 'test \nvery\n\ncommit\n\nBug: Issue 42\nChange-Id: abcdefg\n',
'abcd123'); {current_revision: 'abcd123', submission_id: '111'});
const expected = 'Revert submission\n\n' + const expected = 'Revert submission 111\n\n' +
'Reason for revert: <INSERT REASONING HERE>\n'; 'Reason for revert: <INSERT REASONING HERE>\n';
assert.equal(element.message, expected); assert.equal(element.message, expected);
}); });
@@ -90,8 +90,8 @@ suite('gr-confirm-revert-submission-dialog tests', () => {
assert.isNotOk(element.message); assert.isNotOk(element.message);
element._populateRevertSubmissionMessage( element._populateRevertSubmissionMessage(
'Revert "one line commit"\n\nChange-Id: abcdefg\n', 'Revert "one line commit"\n\nChange-Id: abcdefg\n',
'abcd123'); {current_revision: 'abcd123', submission_id: '111'});
const expected = 'Revert submission\n\n' + const expected = 'Revert submission 111\n\n' +
'Reason for revert: <INSERT REASONING HERE>\n'; 'Reason for revert: <INSERT REASONING HERE>\n';
assert.equal(element.message, expected); assert.equal(element.message, expected);
}); });

1
polygerrit-ui/app/test/tests.js
View File

@@ -66,6 +66,7 @@ const elements = [
'change/gr-confirm-move-dialog/gr-confirm-move-dialog_test.html', 'change/gr-confirm-move-dialog/gr-confirm-move-dialog_test.html',
'change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.html', 'change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.html',
'change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.html', 'change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.html',
'change/gr-confirm-revert-submission-dialog/gr-confirm-revert-submission-dialog_test.html',
'change/gr-confirm-submit-dialog/gr-confirm-submit-dialog_test.html', 'change/gr-confirm-submit-dialog/gr-confirm-submit-dialog_test.html',
'change/gr-download-dialog/gr-download-dialog_test.html', 'change/gr-download-dialog/gr-download-dialog_test.html',
'change/gr-file-list-header/gr-file-list-header_test.html', 'change/gr-file-list-header/gr-file-list-header_test.html',