From 1088efde49b8b44f1ce9dc92951e86f65a98f575 Mon Sep 17 00:00:00 2001
From: kroonprins <kroonprins@users.noreply.github.com>
Date: Sat, 29 Feb 2020 23:04:59 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20bugfix=20for=20hourly=20limit=20for=20az?=
=?UTF-8?q?ure=20&=20bugfix=20for=20ignorePrefi=E2=80=A6=20(#5600)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/config/presets/index.ts | 2 +-
lib/platform/azure/azure-helper.ts | 2 ++
.../azure/__snapshots__/azure-helper.spec.ts.snap | 8 ++++++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/lib/config/presets/index.ts b/lib/config/presets/index.ts
index ae21cfda83..e694730dc8 100644
--- a/lib/config/presets/index.ts
+++ b/lib/config/presets/index.ts
@@ -145,7 +145,7 @@ export async function resolveConfigPresets(
ignorePresets?: string[],
existingPresets: string[] = []
): Promise<RenovateConfig> {
- if (!ignorePresets) {
+ if (!ignorePresets || ignorePresets.length === 0) {
ignorePresets = inputConfig.ignorePresets || []; // eslint-disable-line
}
logger.trace(
diff --git a/lib/platform/azure/azure-helper.ts b/lib/platform/azure/azure-helper.ts
index c539e9fcf0..294971af83 100644
--- a/lib/platform/azure/azure-helper.ts
+++ b/lib/platform/azure/azure-helper.ts
@@ -161,6 +161,8 @@ export function getRenovatePRFormat(azurePr: GitPullRequest): Pr {
pr.number = azurePr.pullRequestId;
pr.body = azurePr.description;
pr.targetBranch = getBranchNameWithoutRefsheadsPrefix(azurePr.targetRefName);
+ pr.branchName = pr.targetBranch;
+ pr.createdAt = pr.creationDate;
// status
// export declare enum PullRequestStatus {
diff --git a/test/platform/azure/__snapshots__/azure-helper.spec.ts.snap b/test/platform/azure/__snapshots__/azure-helper.spec.ts.snap
index 84a2c45350..bac3928c71 100644
--- a/test/platform/azure/__snapshots__/azure-helper.spec.ts.snap
+++ b/test/platform/azure/__snapshots__/azure-helper.spec.ts.snap
@@ -57,6 +57,8 @@ Array [
exports[`platform/azure/helpers getRenovatePRFormat should be formated (closed v2) 1`] = `
Object {
"body": undefined,
+ "branchName": undefined,
+ "createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"isModified": false,
"number": undefined,
@@ -69,6 +71,8 @@ Object {
exports[`platform/azure/helpers getRenovatePRFormat should be formated (closed) 1`] = `
Object {
"body": undefined,
+ "branchName": undefined,
+ "createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"isModified": false,
"number": undefined,
@@ -81,6 +85,8 @@ Object {
exports[`platform/azure/helpers getRenovatePRFormat should be formated (isConflicted) 1`] = `
Object {
"body": undefined,
+ "branchName": undefined,
+ "createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"isConflicted": true,
"isModified": false,
@@ -94,6 +100,8 @@ Object {
exports[`platform/azure/helpers getRenovatePRFormat should be formated (not closed) 1`] = `
Object {
"body": undefined,
+ "branchName": undefined,
+ "createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"isModified": false,
"number": undefined,
--
GitLab