Commit 5d8bc74

authored

Merge pull request #382 from shifqu/fix-convetional-commits-schema-pattern

Fix conventional commits schema pattern

2 parents 6082b64 + e107411 commit 5d8bc74Copy full SHA for 5d8bc74

File tree

+19

-7

lines changed

+19

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,8 @@ def schema(self) -> str:`
`178`	`178`
`179`	`179`	`def schema_pattern(self) -> str:`
`180`	`180`	`PATTERN = (`
`181`		`- r"(build\|ci\|docs\|feat\|fix\|perf\|refactor\|style\|test\|chore\|revert\|bump)!?"`
`182`		`- r"(\(\S+\))?:(\s.*)"`
	`181`	`+ r"(build\|ci\|docs\|feat\|fix\|perf\|refactor\|style\|test\|chore\|revert\|bump)"`
	`182`	`+ r"(\(\S+\))?!?:(\s.*)"`
`183`	`183`	`)`
`184`	`184`	`return PATTERN`
`185`	`185`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,12 +124,15 @@ def test_check_conventional_commit_succeeds(mocker, capsys):`
`124`	`124`	`assert "Commit validation: successful!" in out`
`125`	`125`
`126`	`126`
`127`		`-def test_check_no_conventional_commit(config, mocker, tmpdir):`
	`127`	`+@pytest.mark.parametrize(`
	`128`	`+ "commit_msg", ("feat!(lang): removed polish language", "no conventional commit",),`
	`129`	`+)`
	`130`	`+def test_check_no_conventional_commit(commit_msg, config, mocker, tmpdir):`
`128`	`131`	`with pytest.raises(InvalidCommitMessageError):`
`129`	`132`	`error_mock = mocker.patch("commitizen.out.error")`
`130`	`133`
`131`	`134`	`tempfile = tmpdir.join("temp_commit_file")`
`132`		`- tempfile.write("no conventional commit")`
	`135`	`+ tempfile.write(commit_msg)`
`133`	`136`
`134`	`137`	`check_cmd = commands.Check(`
`135`	`138`	`config=config, arguments={"commit_msg_file": tempfile}`
`@@ -141,6 +144,7 @@ def test_check_no_conventional_commit(config, mocker, tmpdir):`
`141`	`144`	`@pytest.mark.parametrize(`
`142`	`145`	`"commit_msg",`
`143`	`146`	`(`
	`147`	`+ "feat(lang)!: removed polish language",`
`144`	`148`	`"feat(lang): added polish language",`
`145`	`149`	`"feat: add polish language",`
`146`	`150`	`"bump: 0.0.1 -> 1.0.0",`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,15 @@ def test_info(config):`
`132`	`132`	`assert isinstance(info, str)`
`133`	`133`
`134`	`134`
`135`		`-def test_process_commit(config):`
	`135`	`+@pytest.mark.parametrize(`
	`136`	`+ ("commit_message", "expected_message"),`
	`137`	`+ [`
	`138`	`+ ("test(test_scope): this is test msg", "this is test msg",),`
	`139`	`+ ("test(test_scope)!: this is test msg", "this is test msg",),`
	`140`	`+ ("test!(test_scope): this is test msg", "",),`
	`141`	`+ ],`
	`142`	`+)`
	`143`	`+def test_process_commit(commit_message, expected_message, config):`
`136`	`144`	`conventional_commits = ConventionalCommitsCz(config)`
`137`		`- message = conventional_commits.process_commit("test(test_scope): this is test msg")`
`138`		`- assert message == "this is test msg"`
	`145`	`+ message = conventional_commits.process_commit(commit_message)`
	`146`	`+ assert message == expected_message`

Comments

(0)