test(platform/azure): replace squashMerge by mergeStrategy (#26436)

renovatebot · Dec 27, 2023 · 4345212 · 4345212
1 parent 1786438
commit 4345212
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/modules/platform/azure/__snapshots__/index.spec.ts.snap b/lib/modules/platform/azure/__snapshots__/index.spec.ts.snap
@@ -60,7 +60,7 @@ exports[`modules/platform/azure/index createPr() when usePlatformAutomerge is se
   "completionOptions": {
     "deleteSourceBranch": true,
     "mergeCommitMessage": "The Title",
-    "squashMerge": true,
+    "mergeStrategy": 2,
   },
   "createdAt": undefined,
   "createdBy": {

diff --git a/lib/modules/platform/azure/index.spec.ts b/lib/modules/platform/azure/index.spec.ts
@@ -912,7 +912,7 @@ describe('modules/platform/azure/index', () => {
             id: prResult.createdBy.id,
           },
           completionOptions: {
-            squashMerge: true,
+            mergeStrategy: GitPullRequestMergeStrategy.Squash,
             deleteSourceBranch: true,
             mergeCommitMessage: 'The Title',
           },
@@ -962,7 +962,7 @@ describe('modules/platform/azure/index', () => {
               id: prResult[0].createdBy.id,
             },
             completionOptions: {
-              squashMerge: true,
+              mergeStrategy: GitPullRequestMergeStrategy.Squash,
               deleteSourceBranch: true,
               mergeCommitMessage: 'The Title',
             },
@@ -973,7 +973,7 @@ describe('modules/platform/azure/index', () => {
               id: prResult[1].createdBy.id,
             },
             completionOptions: {
-              squashMerge: true,
+              mergeStrategy: GitPullRequestMergeStrategy.Squash,
               deleteSourceBranch: true,
               mergeCommitMessage: 'The Second Title',
             },
@@ -1047,7 +1047,7 @@ describe('modules/platform/azure/index', () => {
               id: prResult.createdBy.id,
             },
             completionOptions: {
-              squashMerge: true,
+              mergeStrategy: GitPullRequestMergeStrategy.Squash,
               deleteSourceBranch: true,
               mergeCommitMessage: 'The Title',
             },
@@ -1101,7 +1101,6 @@ describe('modules/platform/azure/index', () => {
             },
             completionOptions: {
               mergeStrategy: prMergeStrategy,
-              squashMerge: false,
               deleteSourceBranch: true,
               mergeCommitMessage: 'The Title',
             },