Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: check that the author is defined when comparing it with dependab… #258

Merged
merged 2 commits into from Aug 23, 2022
Merged

fix: check that the author is defined when comparing it with dependab… #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ebadb8
fix: check that the author is defined when comparing it with dependab…
marco-ippolito Aug 22, 2022
becbb57
fix: added unkown commit author test case
marco-ippolito Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/index.js
View file
Open in desktop
Expand Up @@ -10463,7 +10463,7 @@ module.exports = async function run() {

const commits = await client.getPullRequestCommits(pr.number)

if (!commits.every(commit => commit.author.login === dependabotAuthor)) {
if (!commits.every(commit => commit.author?.login === dependabotAuthor)) {
return logWarning('PR contains non dependabot commits, skipping.')
}

Expand Down
2 changes: 1 addition & 1 deletion src/action.js
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@ module.exports = async function run() {

const commits = await client.getPullRequestCommits(pr.number)

if (!commits.every(commit => commit.author.login === dependabotAuthor)) {
if (!commits.every(commit => commit.author?.login === dependabotAuthor)) {
return logWarning('PR contains non dependabot commits, skipping.')
}

Expand Down
61 changes: 34 additions & 27 deletions test/action.test.js
View file
Open in desktop
Expand Up @@ -134,38 +134,45 @@ tap.test('should skip non-dependabot PR', async () => {
sinon.assert.notCalled(stubs.mergeStub)
})

tap.test('should skip PR with non dependabot commit', async () => {
const PR_NUMBER = Math.random()
const { action, stubs } = buildStubbedAction({
payload: {
pull_request: {
user: {
login: BOT_NAME,
const prCommitsStubs = [
{
author: {
login: 'not dependabot',
},
},
{
author: undefined,
},
]

for (const prCommitsStub of prCommitsStubs) {
tap.test('should skip PR with non dependabot commit', async () => {
const PR_NUMBER = Math.random()
const { action, stubs } = buildStubbedAction({
payload: {
pull_request: {
user: {
login: BOT_NAME,
},
number: PR_NUMBER,
},
number: PR_NUMBER,
},
},
inputs: { PR_NUMBER },
})
inputs: { PR_NUMBER },
})

stubs.prCommitsStub.resolves([
{
author: {
login: 'not dependabot',
},
},
])
stubs.prCommitsStub.resolves([prCommitsStub])

await action()
await action()

sinon.assert.calledOnce(stubs.prCommitsStub)
sinon.assert.calledWithExactly(
stubs.logStub.logWarning,
'PR contains non dependabot commits, skipping.'
)
sinon.assert.notCalled(stubs.approveStub)
sinon.assert.notCalled(stubs.mergeStub)
})
sinon.assert.calledOnce(stubs.prCommitsStub)
sinon.assert.calledWithExactly(
stubs.logStub.logWarning,
'PR contains non dependabot commits, skipping.'
)
sinon.assert.notCalled(stubs.approveStub)
sinon.assert.notCalled(stubs.mergeStub)
})
}

tap.test(
'should skip PR if dependabot commit signatures cannot be verified',
Expand Down