From 33de5bd8272cde55bfa567181b3753fbf15958f9 Mon Sep 17 00:00:00 2001 From: Trevor Grieger Date: Wed, 11 Jan 2023 01:21:47 -0500 Subject: [PATCH] Update failing mocked tests Signed-off-by: Trevor Grieger --- .../builtin/github/githubRepoPush.test.ts | 64 ++++++++++++++++++ .../actions/builtin/publish/github.test.ts | 66 ++++++++++++++++++- 2 files changed, 129 insertions(+), 1 deletion(-) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.test.ts index f8b45093e6..24777163d4 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.test.ts @@ -287,6 +287,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -309,6 +313,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -331,6 +339,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); }); @@ -356,6 +368,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -378,6 +394,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -400,6 +420,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: false, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); }); @@ -425,6 +449,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -449,6 +477,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -472,6 +504,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -496,6 +532,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); }); @@ -540,6 +580,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -562,6 +606,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: true, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -584,6 +632,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); }); @@ -609,6 +661,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -631,6 +687,10 @@ describe('github:repo:push', () => { requiredConversationResolution: true, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); await action.handler({ @@ -653,6 +713,10 @@ describe('github:repo:push', () => { requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + requiredCommitSigning: false, + restrictions: undefined, }); }); }); 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 e4c92c624e..95ad8b5e40 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 @@ -788,11 +788,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -810,11 +814,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: true, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -832,11 +840,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); }); @@ -860,11 +872,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -882,11 +898,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: false, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -904,11 +924,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); }); @@ -932,11 +956,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -956,11 +984,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, - requiredStatusCheckContexts: ['statusCheck'], + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, + requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -979,11 +1011,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: ['statusCheck'], requireBranchesToBeUpToDate: false, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -1001,11 +1037,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); }); @@ -1084,11 +1124,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -1106,11 +1150,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: true, + requiredCommitSigning: false, }); await action.handler({ @@ -1128,11 +1176,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); }); it('should call enableBranchProtectionOnDefaultRepoBranch with the correct values of requiredConversationResolution', async () => { @@ -1155,11 +1207,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -1177,11 +1233,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: true, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); await action.handler({ @@ -1199,11 +1259,15 @@ describe('publish:github', () => { logger: mockContext.logger, defaultBranch: 'master', requireCodeOwnerReviews: false, + bypassPullRequestAllowances: undefined, + requiredApprovingReviewCount: 1, + restrictions: undefined, requiredStatusCheckContexts: [], requireBranchesToBeUpToDate: true, requiredConversationResolution: false, enforceAdmins: true, dismissStaleReviews: false, + requiredCommitSigning: false, }); }); });