From 9d9ddfcea03899964f58dd60c86ceccdbd69c946 Mon Sep 17 00:00:00 2001 From: Kyle Leonhard Date: Wed, 21 Dec 2022 13:23:48 -0800 Subject: [PATCH] Merge tests Signed-off-by: Kyle Leonhard --- .../actions/builtin/github/githubRepoCreate.test.ts | 8 ++++++++ .../src/scaffolder/actions/builtin/publish/github.test.ts | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts index 673658ebcf..09c81ef57e 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts @@ -175,6 +175,8 @@ describe('github:repo:create', () => { private: true, delete_branch_on_merge: false, allow_squash_merge: true, + squash_merge_commit_message: "COMMIT_MESSAGES", + squash_merge_commit_title: "COMMIT_OR_PR_TITLE", allow_merge_commit: true, allow_rebase_merge: true, allow_auto_merge: false, @@ -200,6 +202,8 @@ describe('github:repo:create', () => { private: true, delete_branch_on_merge: false, allow_squash_merge: true, + squash_merge_commit_message: "COMMIT_MESSAGES", + squash_merge_commit_title: "COMMIT_OR_PR_TITLE", allow_merge_commit: true, allow_rebase_merge: true, allow_auto_merge: false, @@ -297,6 +301,8 @@ describe('github:repo:create', () => { private: true, delete_branch_on_merge: false, allow_squash_merge: true, + squash_merge_commit_message: "COMMIT_MESSAGES", + squash_merge_commit_title: "COMMIT_OR_PR_TITLE", allow_merge_commit: true, allow_rebase_merge: true, allow_auto_merge: false, @@ -322,6 +328,8 @@ describe('github:repo:create', () => { private: true, delete_branch_on_merge: false, allow_squash_merge: true, + squash_merge_commit_message: "COMMIT_MESSAGES", + squash_merge_commit_title: "COMMIT_OR_PR_TITLE", allow_merge_commit: true, allow_rebase_merge: true, allow_auto_merge: false, diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts index 9943b6ff92..e492eb8776 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts @@ -180,6 +180,8 @@ describe('publish:github', () => { private: true, delete_branch_on_merge: false, allow_squash_merge: true, + squash_merge_commit_message: "COMMIT_MESSAGES", + squash_merge_commit_title: "COMMIT_OR_PR_TITLE", allow_merge_commit: true, allow_rebase_merge: true, allow_auto_merge: false, @@ -205,6 +207,8 @@ describe('publish:github', () => { private: true, delete_branch_on_merge: false, allow_squash_merge: true, + squash_merge_commit_message: "COMMIT_MESSAGES", + squash_merge_commit_title: "COMMIT_OR_PR_TITLE", allow_merge_commit: true, allow_rebase_merge: true, allow_auto_merge: false, @@ -302,6 +306,8 @@ describe('publish:github', () => { private: true, delete_branch_on_merge: false, allow_squash_merge: true, + squash_merge_commit_message: "COMMIT_MESSAGES", + squash_merge_commit_title: "COMMIT_OR_PR_TITLE", allow_merge_commit: true, allow_rebase_merge: true, allow_auto_merge: false, @@ -327,6 +333,8 @@ describe('publish:github', () => { private: true, delete_branch_on_merge: false, allow_squash_merge: true, + squash_merge_commit_message: "COMMIT_MESSAGES", + squash_merge_commit_title: "COMMIT_OR_PR_TITLE", allow_merge_commit: true, allow_rebase_merge: true, allow_auto_merge: false,