Skip to content

Commit 8a5f2ca

Browse files
committed
chores: fix branches tests
1 parent 8450339 commit 8a5f2ca

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

docs/sample-settings/sample-deployment-settings.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ overridevalidators:
2727
error: |
2828
`Branch protection required_approving_review_count cannot be overidden to a lower value`
2929
script: |
30-
console.log(`baseConfig ${JSON.stringify(baseconfig)}`)
31-
console.log(`overrideConfig ${JSON.stringify(overrideconfig)}`)
32-
if (baseconfig.protection.required_pull_request_reviews.required_approving_review_count && overrideconfig.protection.required_pull_request_reviews.required_approving_review_count ) {
33-
return overrideconfig.protection.required_pull_request_reviews.required_approving_review_count >= baseconfig.protection.required_pull_request_reviews.required_approving_review_count
30+
const baseCount = baseconfig?.protection?.required_pull_request_reviews?.required_approving_review_count
31+
const overrideCount = overrideconfig?.protection?.required_pull_request_reviews?.required_approving_review_count
32+
if (baseCount && overrideCount) {
33+
return overrideCount >= baseCount
3434
}
3535
return true
3636
- plugin: labels

test/unit/lib/plugins/branches.test.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ describe('Branches', () => {
6767
required_pull_request_reviews: {
6868
require_code_owner_reviews: true
6969
},
70+
restrictions: null,
7071
headers: { accept: 'application/vnd.github.hellcat-preview+json,application/vnd.github.luke-cage-preview+json,application/vnd.github.zzzax-preview+json' }
7172
})
7273
})
@@ -190,6 +191,8 @@ describe('Branches', () => {
190191
strict: true,
191192
contexts: []
192193
},
194+
enforce_admins: null,
195+
restrictions: null,
193196
headers: { accept: 'application/vnd.github.hellcat-preview+json,application/vnd.github.luke-cage-preview+json,application/vnd.github.zzzax-preview+json' }
194197
})
195198
})
@@ -229,6 +232,8 @@ describe('Branches', () => {
229232
strict: true,
230233
contexts: ['check-1', 'check-2']
231234
},
235+
enforce_admins: null,
236+
restrictions: null,
232237
headers: { accept: 'application/vnd.github.hellcat-preview+json,application/vnd.github.luke-cage-preview+json,application/vnd.github.zzzax-preview+json' }
233238
})
234239
})
@@ -267,6 +272,8 @@ describe('Branches', () => {
267272
repo: 'test',
268273
branch: 'other',
269274
enforce_admins: false,
275+
required_status_checks: null,
276+
restrictions: null,
270277
headers: { accept: 'application/vnd.github.hellcat-preview+json,application/vnd.github.luke-cage-preview+json,application/vnd.github.zzzax-preview+json' }
271278
})
272279
})

0 commit comments

Comments
 (0)