test: deduplicate version and report tests

Consolidate three separate version flag tests into a single parametrized
test. Merge standalone deprecation warning tests into the existing
test_version_for_showing_commitizen_version and
test_version_for_showing_commitizen_system_info tests.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: bearomorphism

tests/commands/test_version_command.py

@@ -31,10 +31,14 @@ def test_version_for_showing_project_version(config, capsys):
 
 @pytest.mark.parametrize("project", [True, False])
 def test_version_for_showing_commitizen_version(config, capsys, project: bool):
-    commands.Version(
-        config,
-        {"project": project, "commitizen": True},
-    )()
+    with pytest.warns(
+        DeprecationWarning,
+        match=r"`cz version --commitizen` is deprecated.*Use `cz --version` instead",
+    ):
+        commands.Version(
+            config,
+            {"project": project, "commitizen": True},
+        )()
     captured = capsys.readouterr()
     assert f"{__version__}" in captured.out
 
@@ -63,10 +67,14 @@ def test_version_for_showing_both_versions(config, capsys):
 
 
 def test_version_for_showing_commitizen_system_info(config, capsys):
-    commands.Version(
-        config,
-        {"report": True},
-    )()
+    with pytest.warns(
+        DeprecationWarning,
+        match=r"`cz version --report` is deprecated.*Use `cz --report` instead",
+    ):
+        commands.Version(
+            config,
+            {"report": True},
+        )()
     captured = capsys.readouterr()
     assert f"Commitizen Version: {__version__}" in captured.out
     assert f"Python Version: {sys.version}" in captured.out
@@ -296,23 +304,3 @@ def test_version_no_arguments_shows_commitizen_version(config, capsys):
     commands.Version(config, {})()
     captured = capsys.readouterr()
     assert captured.out.strip() == __version__
-
-
-def test_version_report_emits_deprecation_warning(config, capsys):
-    with pytest.warns(
-        DeprecationWarning,
-        match=r"`cz version --report` is deprecated.*Use `cz --report` instead",
-    ):
-        commands.Version(config, {"report": True})()
-    captured = capsys.readouterr()
-    assert f"Commitizen Version: {__version__}" in captured.out
-
-
-def test_version_commitizen_emits_deprecation_warning(config, capsys):
-    with pytest.warns(
-        DeprecationWarning,
-        match=r"`cz version --commitizen` is deprecated.*Use `cz --version` instead",
-    ):
-        commands.Version(config, {"commitizen": True})()
-    captured = capsys.readouterr()
-    assert __version__ in captured.out

tests/test_cli.py

@@ -56,26 +56,19 @@ def test_cz_with_arg_but_without_command(util: UtilFixture):
     assert "Command is required" in str(excinfo.value)
 
 
-def test_cz_with_version_arg(util: UtilFixture, capsys):
-    """Test that cz shows the version when --version is used."""
-    with pytest.raises(ExpectedExit):
-        util.run_cli("--version")
-    out, _ = capsys.readouterr()
-    assert __version__ in out
-
-
-def test_cz_with_version_short_arg(util: UtilFixture, capsys):
-    """Test that cz shows the version when -v is used."""
-    with pytest.raises(ExpectedExit):
-        util.run_cli("-v")
-    out, _ = capsys.readouterr()
-    assert __version__ in out
-
-
-def test_cz_version_flag_takes_precedence_over_subcommand(util: UtilFixture, capsys):
-    """Test that --version takes precedence even when a subcommand is given."""
+@pytest.mark.parametrize(
+    "args",
+    [
+        ("--version",),
+        ("-v",),
+        ("--version", "bump"),
+    ],
+    ids=["long-flag", "short-flag", "precedence-over-subcommand"],
+)
+def test_cz_with_version_arg(util: UtilFixture, capsys, args):
+    """Test that cz --version / -v shows the version and takes precedence."""
     with pytest.raises(ExpectedExit):
-        util.run_cli("--version", "bump")
+        util.run_cli(*args)
     out, _ = capsys.readouterr()
     assert __version__ in out