fix: compute recreateClosed for normal PRs (#23298)

renovatebot · Jul 11, 2023 · 9666506 · 9666506
1 parent 0bc7e61
commit 9666506
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap b/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap
@@ -23,6 +23,7 @@ exports[`workers/repository/updates/generate generateBranchConfig() handles @typ
   "prBodyColumns": [],
   "prTitle": "some-title",
   "prettyDepType": "dependency",
+  "recreateClosed": false,
   "releaseTimestamp": undefined,
   "reuseLockFiles": true,
   "upgrades": [
@@ -41,6 +42,7 @@ exports[`workers/repository/updates/generate generateBranchConfig() handles @typ
       "newValue": "0.6.0",
       "prTitle": "some-title",
       "prettyDepType": "dependency",
+      "recreateClosed": false,
     },
     {
       "branchName": "some-branch",
@@ -59,6 +61,7 @@ exports[`workers/repository/updates/generate generateBranchConfig() handles @typ
       "newValue": "1.0.0",
       "prTitle": "some-other-title",
       "prettyDepType": "dependency",
+      "recreateClosed": false,
     },
     {
       "branchName": "some-branch",
@@ -74,6 +77,7 @@ exports[`workers/repository/updates/generate generateBranchConfig() handles @typ
       "newValue": "0.5.7",
       "prTitle": "some-title",
       "prettyDepType": "dependency",
+      "recreateClosed": false,
     },
   ],
 }
@@ -136,6 +140,7 @@ exports[`workers/repository/updates/generate generateBranchConfig() handles @typ
       "newValue": "1.0.0",
       "prTitle": "some-other-title",
       "prettyDepType": "dependency",
+      "recreateClosed": false,
     },
     {
       "branchName": "some-branch",
@@ -155,6 +160,7 @@ exports[`workers/repository/updates/generate generateBranchConfig() handles @typ
       "prTitle": "some-title",
       "prettyDepType": "dependency",
       "prettyNewVersion": "v0.5.8",
+      "recreateClosed": false,
     },
   ],
 }
@@ -223,6 +229,7 @@ exports[`workers/repository/updates/generate generateBranchConfig() handles lock
   "prTitle": "some-title",
   "prettyDepType": "dependency",
   "prettyNewVersion": "v1.0.1",
+  "recreateClosed": false,
   "releaseTimestamp": undefined,
   "reuseLockFiles": true,
   "upgrades": [
@@ -243,6 +250,7 @@ exports[`workers/repository/updates/generate generateBranchConfig() handles lock
       "prTitle": "some-title",
       "prettyDepType": "dependency",
       "prettyNewVersion": "v1.0.1",
+      "recreateClosed": false,
     },
   ],
 }

diff --git a/lib/workers/repository/updates/generate.spec.ts b/lib/workers/repository/updates/generate.spec.ts
@@ -46,6 +46,7 @@ describe('workers/repository/updates/generate', () => {
       expect(res.foo).toBe(1);
       expect(res.groupName).toBeUndefined();
       expect(res.releaseTimestamp).toBeDefined();
+      expect(res.recreateClosed).toBe(false);
     });
 
     it('handles lockFileMaintenance', () => {
@@ -143,6 +144,7 @@ describe('workers/repository/updates/generate', () => {
       const res = generateBranchConfig(branch);
       expect(res.foo).toBe(1);
       expect(res.groupName).toBeUndefined();
+      expect(res.recreateClosed).toBe(false);
     });
 
     it('groups multiple upgrades same version', () => {
@@ -215,6 +217,7 @@ describe('workers/repository/updates/generate', () => {
         foo: '1.0.0',
         bar: '2.0.0',
       });
+      expect(res.recreateClosed).toBe(false);
     });
 
     it('groups major updates with different versions but same newValue, no recreateWhen', () => {
@@ -528,7 +531,7 @@ describe('workers/repository/updates/generate', () => {
       const res = generateBranchConfig(branch);
       expect(res.foo).toBe(2);
       expect(res.singleVersion).toBeUndefined();
-      expect(res.recreateClosed).toBeUndefined();
+      expect(res.recreateClosed).toBeFalse();
       expect(res.groupName).toBeDefined();
       expect(res.releaseTimestamp).toBe('2017-02-08T20:01:41+00:00');
     });
@@ -571,7 +574,7 @@ describe('workers/repository/updates/generate', () => {
       const res = generateBranchConfig(branch);
       expect(res.foo).toBe(2);
       expect(res.singleVersion).toBeUndefined();
-      expect(res.recreateClosed).toBeUndefined();
+      expect(res.recreateClosed).toBeFalse();
       expect(res.groupName).toBeDefined();
       expect(res.releaseTimestamp).toBe('2017-02-08T20:01:41+00:00');
     });

diff --git a/lib/workers/repository/updates/generate.ts b/lib/workers/repository/updates/generate.ts
@@ -83,6 +83,8 @@ export function generateBranchConfig(
   const toVersions: string[] = [];
   const toValues = new Set<string>();
   for (const upg of branchUpgrades) {
+    upg.recreateClosed = upg.recreateWhen === 'always';
+
     if (upg.currentDigest) {
       upg.currentDigestShort =
         upg.currentDigestShort ??