refactor: new checkExistingBranch function in doAutoReplace (#17500)

renovatebot · Aug 30, 2022 · 7f4185b · 7f4185b
1 parent 92f6a9c
commit 7f4185b
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/lib/workers/repository/update/branch/auto-replace.ts b/lib/workers/repository/update/branch/auto-replace.ts
@@ -105,6 +105,29 @@ export async function checkBranchDepsMatchBaseDeps(
   }
 }
 
+async function checkExistingBranch(
+  upgrade: BranchUpgradeConfig,
+  existingContent: string
+): Promise<string | null> {
+  const { packageFile, depName } = upgrade;
+  if (!(await checkBranchDepsMatchBaseDeps(upgrade, existingContent))) {
+    logger.debug(
+      { packageFile, depName },
+      'Rebasing branch after deps list has changed'
+    );
+    return null;
+  }
+  if (!(await confirmIfDepUpdated(upgrade, existingContent))) {
+    logger.debug(
+      { packageFile, depName },
+      'Rebasing after outdated branch dep found'
+    );
+    return null;
+  }
+  logger.debug({ packageFile, depName }, 'Branch dep is already updated');
+  return existingContent;
+}
+
 export async function doAutoReplace(
   upgrade: BranchUpgradeConfig,
   existingContent: string,
@@ -120,22 +143,7 @@ export async function doAutoReplace(
     autoReplaceStringTemplate,
   } = upgrade;
   if (reuseExistingBranch) {
-    if (!(await checkBranchDepsMatchBaseDeps(upgrade, existingContent))) {
-      logger.debug(
-        { packageFile, depName },
-        'Rebasing branch after deps list has changed'
-      );
-      return null;
-    }
-    if (!(await confirmIfDepUpdated(upgrade, existingContent))) {
-      logger.debug(
-        { packageFile, depName },
-        'Rebasing after outdated branch dep found'
-      );
-      return null;
-    }
-    logger.debug({ packageFile, depName }, 'Branch dep is already updated');
-    return existingContent;
+    return await checkExistingBranch(upgrade, existingContent);
   }
   const replaceString = upgrade.replaceString ?? currentValue;
   logger.trace({ depName, replaceString }, 'autoReplace replaceString');