test(changelog_merge_prerelease): add tests for changelog_merge_prerelease during bump

Author: zimmermannJakob

tests/commands/test_bump_command.py

@@ -1737,3 +1737,74 @@ def test_is_initial_tag(mocker: MockFixture, tmp_commitizen_project):
     # Test case 4: No current tag, user denies
     mocker.patch("questionary.confirm", return_value=mocker.Mock(ask=lambda: False))
     assert bump_cmd._is_initial_tag(None, is_yes=False) is False
+
+
+@pytest.mark.parametrize("test_input", ["rc", "alpha", "beta"])
+@pytest.mark.usefixtures("tmp_commitizen_project")
+def test_changelog_config_flag_merge_prerelease(
+    mocker: MockFixture, changelog_path, config_path, file_regression, test_input
+):
+    with open(config_path, "a") as f:
+        f.write("changelog_merge_prerelease = true\n")
+        f.write("update_changelog_on_bump = true\n")
+        f.write("annotated_tag = true\n")
+
+    create_file_and_commit("irrelevant commit")
+    mocker.patch("commitizen.git.GitTag.date", "1970-01-01")
+    git.tag("0.1.0")
+
+    create_file_and_commit("feat: add new output")
+    create_file_and_commit("fix: output glitch")
+    testargs = ["cz", "bump", "--prerelease", test_input, "--yes"]
+    mocker.patch.object(sys, "argv", testargs)
+    cli.main()
+
+    testargs = ["cz", "bump", "--changelog"]
+
+    mocker.patch.object(sys, "argv", testargs)
+    cli.main()
+
+    with open(changelog_path) as f:
+        out = f.read()
+        out = re.sub(
+            r"\([^)]*\)", "", out
+        )  # remove date from release, since I have no idea how to mock that
+        print(out)
+
+    file_regression.check(out, extension=".md")
+
+
+@pytest.mark.parametrize("test_input", ["rc", "alpha", "beta"])
+@pytest.mark.usefixtures("tmp_commitizen_project")
+def test_changelog_config_flag_merge_prerelease_more_commits(
+    mocker: MockFixture, changelog_path, config_path, file_regression, test_input
+):
+    # supposed to verify that logic regarding indexes is generic
+    with open(config_path, "a") as f:
+        f.write("changelog_merge_prerelease = true\n")
+        f.write("update_changelog_on_bump = true\n")
+        f.write("annotated_tag = true\n")
+
+    create_file_and_commit("feat: more relevant commit")
+    mocker.patch("commitizen.git.GitTag.date", "1970-01-01")
+    git.tag("0.1.0")
+
+    create_file_and_commit("feat: add new output")
+    create_file_and_commit("fix: output glitch")
+    testargs = ["cz", "bump", "--prerelease", test_input, "--yes"]
+    mocker.patch.object(sys, "argv", testargs)
+    cli.main()
+
+    testargs = ["cz", "bump", "--changelog"]
+
+    mocker.patch.object(sys, "argv", testargs)
+    cli.main()
+
+    with open(changelog_path) as f:
+        out = f.read()
+        out = re.sub(
+            r"\([^)]*\)", "", out
+        )  # remove date from release, since I have no idea how to mock that
+        print(out)
+
+    file_regression.check(out, extension=".md")

tests/commands/test_bump_command/test_changelog_config_flag_merge_prerelease_alpha_.md

@@ -0,0 +1,11 @@
+## 0.2.0
+
+### Feat
+
+- add new output
+
+### Fix
+
+- output glitch
+
+## 0.1.0

tests/commands/test_bump_command/test_changelog_config_flag_merge_prerelease_beta_.md

@@ -0,0 +1,11 @@
+## 0.2.0
+
+### Feat
+
+- add new output
+
+### Fix
+
+- output glitch
+
+## 0.1.0

tests/commands/test_bump_command/test_changelog_config_flag_merge_prerelease_more_commits_alpha_.md

@@ -0,0 +1,15 @@
+## 0.2.0
+
+### Feat
+
+- add new output
+
+### Fix
+
+- output glitch
+
+## 0.1.0
+
+### Feat
+
+- more relevant commit

tests/commands/test_bump_command/test_changelog_config_flag_merge_prerelease_more_commits_beta_.md

@@ -0,0 +1,15 @@
+## 0.2.0
+
+### Feat
+
+- add new output
+
+### Fix
+
+- output glitch
+
+## 0.1.0
+
+### Feat
+
+- more relevant commit

tests/commands/test_bump_command/test_changelog_config_flag_merge_prerelease_more_commits_rc_.md

@@ -0,0 +1,15 @@
+## 0.2.0
+
+### Feat
+
+- add new output
+
+### Fix
+
+- output glitch
+
+## 0.1.0
+
+### Feat
+
+- more relevant commit

tests/commands/test_bump_command/test_changelog_config_flag_merge_prerelease_rc_.md

@@ -0,0 +1,11 @@
+## 0.2.0
+
+### Feat
+
+- add new output
+
+### Fix
+
+- output glitch
+
+## 0.1.0