test(bump): add missing tests for local-version flag

Author: marcossantiago

commitizen/bump.py

@@ -124,14 +124,14 @@ def generate_version(
         MINOR 1.0.0 -> 1.1.0
         MAJOR 1.0.0 -> 2.0.0
     """
-    pre_version = prerelease_generator(current_version, prerelease=prerelease)
-
     if is_local_version:
         version = Version(current_version)
-        local_semver = semver_generator(str(version.local), increment=increment)
+        pre_version = prerelease_generator(str(version.local), prerelease=prerelease)
+        semver = semver_generator(str(version.local), increment=increment)
 
-        return Version(f"{version.public}+{local_semver}{pre_version}")
+        return Version(f"{version.public}+{semver}{pre_version}")
     else:
+        pre_version = prerelease_generator(current_version, prerelease=prerelease)
         semver = semver_generator(current_version, increment=increment)
 
         # TODO: post version
@@ -199,7 +199,7 @@ def create_tag(version: Union[Version, str], tag_format: Optional[str] = None):
         version = Version(version)
 
     if not tag_format:
-        return version.public
+        return str(version)
 
     major, minor, patch = version.release
     prerelease = ""

tests/commands/test_bump_command.py

@@ -243,6 +243,27 @@ def test_bump_files_only(mocker, tmp_commitizen_project):
         assert "0.3.0" in f.read()
 
 
+def test_bump_local_version(mocker, tmp_commitizen_project):
+    tmp_version_file = tmp_commitizen_project.join("__version__.py")
+    tmp_version_file.write("4.5.1+0.1.0")
+    tmp_commitizen_cfg_file = tmp_commitizen_project.join("pyproject.toml")
+    tmp_commitizen_cfg_file.write(
+        f"[tool.commitizen]\n"
+        'version="4.5.1+0.1.0"\n'
+        f'version_files = ["{str(tmp_version_file)}"]'
+    )
+
+    create_file_and_commit("feat: new user interface")
+    testargs = ["cz", "bump", "--yes", "--local-version"]
+    mocker.patch.object(sys, "argv", testargs)
+    cli.main()
+    tag_exists = git.tag_exist("4.5.1+0.2.0")
+    assert tag_exists is True
+
+    with open(tmp_version_file, "r") as f:
+        assert "4.5.1+0.2.0" in f.read()
+
+
 def test_bump_dry_run(mocker, capsys, tmp_commitizen_project):
     create_file_and_commit("feat: new file")
 

tests/test_bump_create_tag.py

@@ -10,6 +10,9 @@
     (("1.2.3", "ver$major.$minor.$patch"), "ver1.2.3"),
     (("1.2.3a0", "ver$major.$minor.$patch.$prerelease"), "ver1.2.3.a0"),
     (("1.2.3rc2", "$major.$minor.$patch.$prerelease-majestic"), "1.2.3.rc2-majestic"),
+    (("1.2.3+1.0.0", "v$version"), "v1.2.3+1.0.0"),
+    (("1.2.3+1.0.0", "v$version-local"), "v1.2.3+1.0.0-local"),
+    (("1.2.3+1.0.0", "ver$major.$minor.$patch"), "ver1.2.3"),
 ]
 
 

tests/test_bump_find_version.py

@@ -30,6 +30,12 @@
     (("1.2.1", "MAJOR", None), "2.0.0"),
 ]
 
+local_versions = [
+    (("4.5.0+0.1.0", "PATCH", None), "4.5.0+0.1.1"),
+    (("4.5.0+0.1.1", "MINOR", None), "4.5.0+0.2.0"),
+    (("4.5.0+0.2.0", "MAJOR", None), "4.5.0+1.0.0"),
+]
+
 # this cases should be handled gracefully
 unexpected_cases = [
     (("0.1.1rc0", None, "alpha"), "0.1.1a0"),
@@ -73,3 +79,19 @@ def test_generate_version(test_input, expected):
     assert generate_version(
         current_version, increment=increment, prerelease=prerelease
     ) == Version(expected)
+
+
+@pytest.mark.parametrize(
+    "test_input,expected", itertools.chain(local_versions),
+)
+def test_generate_version_local(test_input, expected):
+    current_version = test_input[0]
+    increment = test_input[1]
+    prerelease = test_input[2]
+    is_local_version = True
+    assert generate_version(
+        current_version,
+        increment=increment,
+        prerelease=prerelease,
+        is_local_version=is_local_version,
+    ) == Version(expected)