From d1cc6cd1164d592ba168baf8b0d8c45a6db80739 Mon Sep 17 00:00:00 2001
From: Hasan Awad <90554456+hasanwhitesource@users.noreply.github.com>
Date: Thu, 4 Aug 2022 22:33:15 +0300
Subject: [PATCH] fix(repository/update/pr/body): fix a test having wrong
homepage and use regex (#16970)
---
lib/workers/repository/update/pr/body/index.spec.ts | 2 +-
lib/workers/repository/update/pr/body/index.ts | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/lib/workers/repository/update/pr/body/index.spec.ts b/lib/workers/repository/update/pr/body/index.spec.ts
index 82ba566199..91733d1e9f 100644
--- a/lib/workers/repository/update/pr/body/index.spec.ts
+++ b/lib/workers/repository/update/pr/body/index.spec.ts
@@ -101,7 +101,7 @@ describe('workers/repository/update/pr/body/index', () => {
dependencyUrl: 'https://github.com/foo/bar',
homepage: 'https://example.com',
references:
- '[homepage](https://example.com), [source](https://github.com/foo/bar.git/tree/HEAD//baz), [changelog](https://raw.githubusercontent.com/foo/bar/tree/main/CHANGELOG.md)',
+ '[homepage](https://example.com), [source](https://github.com/foo/bar.git/tree/HEAD/baz), [changelog](https://raw.githubusercontent.com/foo/bar/tree/main/CHANGELOG.md)',
sourceDirectory: '/baz',
sourceUrl: 'https://github.com/foo/bar.git',
});
diff --git a/lib/workers/repository/update/pr/body/index.ts b/lib/workers/repository/update/pr/body/index.ts
index 2b344ed5a2..13a3fe90f3 100644
--- a/lib/workers/repository/update/pr/body/index.ts
+++ b/lib/workers/repository/update/pr/body/index.ts
@@ -2,7 +2,7 @@ import { PrDebugData, platform } from '../../../../../modules/platform';
import { regEx } from '../../../../../util/regex';
import { toBase64 } from '../../../../../util/string';
import * as template from '../../../../../util/template';
-import { ensureTrailingSlash } from '../../../../../util/url';
+import { joinUrlParts } from '../../../../../util/url';
import type { BranchConfig } from '../../../../types';
import { getChangelogs } from './changelogs';
import { getPrConfigDescription } from './config-description';
@@ -45,10 +45,7 @@ function massageUpdateMetadata(config: BranchConfig): void {
if (sourceUrl) {
let fullUrl = sourceUrl;
if (sourceDirectory) {
- fullUrl =
- ensureTrailingSlash(sourceUrl) +
- 'tree/HEAD/' +
- sourceDirectory.replace('^/?/', '');
+ fullUrl = joinUrlParts(sourceUrl, 'tree/HEAD/', sourceDirectory);
}
references.push(`[source](${fullUrl})`);
}
--
GitLab