Skip to content

Commit

Permalink
Merge pull request #259 from wagoid/fix/help-url-ignored
Browse files Browse the repository at this point in the history
fix: use helpUrl from config when present
  • Loading branch information
wagoid committed Oct 11, 2021
2 parents 06415eb + 6f0b49b commit 40f4505
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 3 deletions.
4 changes: 4 additions & 0 deletions fixtures/custom-help-url/commitlint.config.js
@@ -0,0 +1,4 @@
module.exports = {
extends: ['@commitlint/config-conventional'],
helpUrl: 'https://example.org',
}
6 changes: 3 additions & 3 deletions src/action.js
Expand Up @@ -91,12 +91,12 @@ function getOptsFromConfig(config) {
}
}

const formatErrors = (lintedCommits) =>
const formatErrors = (lintedCommits, { config }) =>
format(
{ results: lintedCommits.map((commit) => commit.lintResult) },
{
color: true,
helpUrl: getInput('helpURL'),
helpUrl: config.helpUrl || getInput('helpURL'),
},
)

Expand Down Expand Up @@ -129,7 +129,7 @@ const showLintResults = async ([from, to]) => {
hash: commit.hash,
})),
)
const formattedResults = formatErrors(lintedCommits)
const formattedResults = formatErrors(lintedCommits, { config })

generateOutputs(lintedCommits)

Expand Down
28 changes: 28 additions & 0 deletions src/action.test.js
Expand Up @@ -76,6 +76,13 @@ describe('Commit Linter action', () => {
await runAction()

td.verify(core.setFailed(contains('You have commit messages with errors')))
td.verify(
core.setFailed(
contains(
'https://github.com/conventional-changelog/commitlint/#what-is-commitlint',
),
),
)
})

it('should fail for single push with incorrect message', async () => {
Expand Down Expand Up @@ -577,4 +584,25 @@ describe('Commit Linter action', () => {
td.verify(console.log('Lint free! 🎉'))
})
})

describe('when a different helpUrl is provided in the config', () => {
beforeEach(async () => {
cwd = await git.bootstrap('fixtures/custom-help-url')
await gitEmptyCommit(cwd, 'wrong message')
const [to] = await getCommitHashes(cwd)
await createPushEventPayload(cwd, { to })
updatePushEnvVars(cwd, to)
td.replace(process, 'cwd', () => cwd)
td.replace(console, 'log')
})

it('should show custom URL from helpUrl', async () => {
await runAction()

td.verify(
core.setFailed(contains('You have commit messages with errors')),
)
td.verify(core.setFailed(contains(' https://example.org')))
})
})
})

0 comments on commit 40f4505

Please sign in to comment.