opendev/gerrit
Code Issues Proposed changes

Merge "Swap baseCommit and commit for weblinks"

Browse Source
This commit is contained in:
Wyatt Allen
2018-02-05 18:53:14 +00:00
committed by Gerrit Code Review
parent c0bb61320c fbeb8c929a
commit a4d59f0686
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -653,10 +653,10 @@
} }
this.filesWeblinks = { this.filesWeblinks = {
meta_a: Gerrit.Nav.getFileWebLinks( meta_a: Gerrit.Nav.getFileWebLinks(
this.projectName, this.commitRange.commit, this.path, this.projectName, this.commitRange.baseCommit, this.path,
{weblinks: diff && diff.meta_a && diff.meta_a.web_links}), {weblinks: diff && diff.meta_a && diff.meta_a.web_links}),
meta_b: Gerrit.Nav.getFileWebLinks( meta_b: Gerrit.Nav.getFileWebLinks(
this.projectName, this.commitRange.baseCommit, this.path, this.projectName, this.commitRange.commit, this.path,
{weblinks: diff && diff.meta_b && diff.meta_b.web_links}), {weblinks: diff && diff.meta_b && diff.meta_b.web_links}),
}; };
return diff; return diff;

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

@@ -191,12 +191,30 @@ limitations under the License.
test('loads files weblinks', () => { test('loads files weblinks', () => {
const weblinksStub = sandbox.stub(Gerrit.Nav, '_generateWeblinks') const weblinksStub = sandbox.stub(Gerrit.Nav, '_generateWeblinks')
.returns([{name: 'stubb', url: '#s'}]); .returns({name: 'stubb', url: '#s'});
sandbox.stub(element.$.restAPI, 'getDiff').returns(Promise.resolve({})); sandbox.stub(element.$.restAPI, 'getDiff').returns(Promise.resolve({}));
element.commitRange = {}; element.projectName = 'test-project';
element.path = 'test-path';
element.commitRange = {baseCommit: 'test-base', commit: 'test-commit'};
element.patchRange = {}; element.patchRange = {};
return element._getDiff().then(() => { return element._getDiff().then(() => {
assert.isTrue(weblinksStub.called); assert.isTrue(weblinksStub.calledTwice);
assert.isTrue(weblinksStub.firstCall.calledWith({
commit: 'test-base',
file: 'test-path',
options: {
weblinks: undefined,
},
repo: 'test-project',
type: Gerrit.Nav.WeblinkType.FILE}));
assert.isTrue(weblinksStub.secondCall.calledWith({
commit: 'test-commit',
file: 'test-path',
options: {
weblinks: undefined,
},
repo: 'test-project',
type: Gerrit.Nav.WeblinkType.FILE}));
assert.deepEqual(element.filesWeblinks, { assert.deepEqual(element.filesWeblinks, {
meta_a: [{name: 'stubb', url: '#s'}], meta_a: [{name: 'stubb', url: '#s'}],
meta_b: [{name: 'stubb', url: '#s'}], meta_b: [{name: 'stubb', url: '#s'}],