commit 6583ec93835aee61a9185acd7658d79373838b3f Author: Dhruv Srivastava Date: Fri Oct 9 10:04:53 2020 +0200 Use Side type for checking if line is left or not Side.LEFT is "left" instead of LEFT. Change-Id: Ie0cac659357b0b796d997c1fe31a84d07085e26e diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js index 57a9e97..4bfa6a9 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js @@ -52,6 +52,7 @@ import { isMagicPath, specialFilePathCompare, } from '../../../utils/path-list-util.js'; import {changeBaseURL, changeIsOpen} from '../../../utils/change-util.js'; +import {Side} from '../../../constants/constants.js'; const ERR_REVIEW_STATUS = 'Couldn’t change file review status.'; const MSG_LOADING_BLAME = 'Loading blame...'; @@ -1218,8 +1219,8 @@ class GrDiffView extends KeyboardShortcutMixin( if (!this._change) { return; } const number = detail.number; // for on-comment-anchor-tap side can be PARENT/REVISIONS - // for on-line-selected side can be LEFT/RIGHT - const leftSide = detail.side === 'LEFT' || detail.side === 'PARENT'; + // for on-line-selected side can be left/right + const leftSide = detail.side === Side.LEFT || detail.side === 'PARENT'; const url = GerritNav.getUrlForDiffById(this._changeNum, this._change.project, this._path, this._patchRange.patchNum, this._patchRange.basePatchNum, number, leftSide); diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js index 5429ea2..b63af54 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js @@ -1282,6 +1282,29 @@ suite('gr-diff-view tests', () => { assert.isTrue(replaceStateStub.called); assert.isTrue(getUrlStub.called); + assert.isFalse(getUrlStub.lastCall.args[6]); + }); + + test('line selected on left side', () => { + const getUrlStub = sinon.stub(GerritNav, 'getUrlForDiffById'); + const replaceStateStub = sinon.stub(history, 'replaceState'); + sinon.stub(element.$.cursor, 'getAddress') + .returns({number: 123, isLeftSide: true}); + + element._changeNum = 321; + element._change = {_number: 321, project: 'foo/bar'}; + element._patchRange = { + basePatchNum: '3', + patchNum: '5', + }; + const e = {}; + const detail = {number: 123, side: 'left'}; + + element._onLineSelected(e, detail); + + assert.isTrue(replaceStateStub.called); + assert.isTrue(getUrlStub.called); + assert.isTrue(getUrlStub.lastCall.args[6]); }); test('_getDiffViewMode', () => {