opendev/gerrit
Code Issues Proposed changes

Merge "PG: Assume weblinks have correct direct or relative urls" into stable-2.16

Browse Source
This commit is contained in:
Sven Selberg
2019-02-18 14:49:09 +00:00
committed by Gerrit Code Review
parent db46a86e38 a9d753475d
commit 1aca2b1500
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
polygerrit-ui/app/elements/core/gr-router/gr-router.js
View File

@@ -326,13 +326,7 @@
return weblinks.filter(weblink => return weblinks.filter(weblink =>
!commitWeblink || !commitWeblink ||
!commitWeblink.name || !commitWeblink.name ||
weblink.name !== commitWeblink.name) weblink.name !== commitWeblink.name);
.map(({name, url}) => {
if (!url.startsWith('https:') && !url.startsWith('http:')) {
url = this.getBaseUrl() + (url.startsWith('/') ? '' : '/') + url;
}
return {name, url};
});
}, },
_getFileWebLinks({repo, commit, file, options: {weblinks}}) { _getFileWebLinks({repo, commit, file, options: {weblinks}}) {

11
polygerrit-ui/app/elements/core/gr-router/gr-router_test.html
View File

@@ -74,20 +74,15 @@ limitations under the License.
const browserLink = {name: 'browser', url: 'browser/url'}; const browserLink = {name: 'browser', url: 'browser/url'};
const mapLinksToConfig = weblinks => ({options: {weblinks}}); const mapLinksToConfig = weblinks => ({options: {weblinks}});
sandbox.stub(element, '_getBrowseCommitWeblink').returns(browserLink); sandbox.stub(element, '_getBrowseCommitWeblink').returns(browserLink);
sandbox.stub(element, 'getBaseUrl').returns('base');
assert.deepEqual( assert.deepEqual(
element._getChangeWeblinks(mapLinksToConfig([link, browserLink]))[0], element._getChangeWeblinks(mapLinksToConfig([link, browserLink]))[0],
{name: 'test', url: 'base/test/url'}); {name: 'test', url: 'test/url'});
assert.deepEqual(element._getChangeWeblinks(mapLinksToConfig([link]))[0], assert.deepEqual(element._getChangeWeblinks(mapLinksToConfig([link]))[0],
{name: 'test', url: 'base/test/url'}); {name: 'test', url: 'test/url'});
link.url = '/' + link.url; link.url = 'https://' + link.url;
assert.deepEqual(element._getChangeWeblinks(mapLinksToConfig([link]))[0],
{name: 'test', url: 'base/test/url'});
link.url = 'https:/' + link.url;
assert.deepEqual(element._getChangeWeblinks(mapLinksToConfig([link]))[0], assert.deepEqual(element._getChangeWeblinks(mapLinksToConfig([link]))[0],
{name: 'test', url: 'https://test/url'}); {name: 'test', url: 'https://test/url'});
}); });