feat(tests): refactor override and extend settings tests for clarity and precedence

Author: rockleona

tests/test_cz_conventional_commits.py

@@ -175,81 +175,93 @@ def test_info(config):
     assert isinstance(info, str)
 
 
-def test_override_change_type_choices(config):
+def test_override_takes_precedence_over_extend(config):
     config.settings["override"] = {
-        "change_type_choices": [
-            {
-                "value": "foo",
-                "name": "foo: non standard change",
-                "key": "o",
-            }
-        ]
-    }
-
-    conventional_commits = ConventionalCommitsCz(config)
-    questions = conventional_commits.questions()
-    change_type_question = next(q for q in questions if q["name"] == "prefix")
-    choices = change_type_question["choices"]
-    assert choices == [
-        {
-            "value": "foo",
-            "name": "foo: non standard change",
-            "key": "o",
+        "bump_map": {
+            "^bar": "PATCH",
         }
-    ]
-
-
-def test_extend_bump_map_merges(config, monkeypatch):
-    monkeypatch.setattr(
-        ConventionalCommitsCz, "bump_map", dict(ConventionalCommitsCz.bump_map)
-    )
+    }
     config.settings["extend"] = {
         "bump_map": {
             "^foo": "MINOR",
         }
     }
 
     conventional_commits = ConventionalCommitsCz(config)
-    assert conventional_commits.bump_map["^foo"] == "MINOR"
-    assert r"^feat" in conventional_commits.bump_map
+    assert conventional_commits.bump_map == {"^bar": "PATCH"}
 
 
-def test_extend_change_type_choices_appends(config, monkeypatch):
-    monkeypatch.setattr(
-        ConventionalCommitsCz,
-        "change_type_choices",
-        [*ConventionalCommitsCz.change_type_choices],
-    )
-    config.settings["extend"] = {
+@pytest.mark.parametrize("mode", ["override", "extend"])
+def test_apply_supported_settings(mode, config):
+    config.settings[mode] = {
+        "bump_pattern": r"^foo:",
+        "bump_map": {r"^foo": "MINOR"},
+        "bump_map_major_version_zero": {r"^foo": "PATCH"},
+        "commit_parser": r"^(?P<change_type>foo):\s(?P<message>.*)$",
+        "changelog_pattern": r"^(foo)",
+        "change_type_map": {"foo": "Foo"},
         "change_type_choices": [
             {
                 "value": "foo",
-                "name": "foo: non standard change",
+                "name": "foo: custom type",
                 "key": "o",
             }
-        ]
+        ],
     }
 
     conventional_commits = ConventionalCommitsCz(config)
-    questions = conventional_commits.questions()
-    change_type_question = next(q for q in questions if q["name"] == "prefix")
-    choice_values = {choice["value"] for choice in change_type_question["choices"]}
-
-    assert "fix" in choice_values
-    assert "foo" in choice_values
 
+    assert conventional_commits.bump_pattern == r"^foo:"
+    assert (
+        conventional_commits.commit_parser
+        == r"^(?P<change_type>foo):\s(?P<message>.*)$"
+    )
+    assert conventional_commits.changelog_pattern == r"^(foo)"
 
-def test_override_takes_precedence_over_extend(config):
-    config.settings["override"] = {
-        "bump_map": {
-            "^bar": "PATCH",
-        }
-    }
+    if mode == "override":
+        assert conventional_commits.bump_map == {r"^foo": "MINOR"}
+        assert conventional_commits.bump_map_major_version_zero == {r"^foo": "PATCH"}
+        assert conventional_commits.change_type_map == {"foo": "Foo"}
+        assert conventional_commits.change_type_choices == [
+            {
+                "value": "foo",
+                "name": "foo: custom type",
+                "key": "o",
+            }
+        ]
+    else:
+        assert conventional_commits.bump_map[r"^foo"] == "MINOR"
+        assert conventional_commits.bump_map_major_version_zero[r"^foo"] == "PATCH"
+        assert conventional_commits.change_type_map["foo"] == "Foo"
+        assert r"^feat" in conventional_commits.bump_map
+        assert any(
+            choice["value"] == "foo"
+            for choice in conventional_commits.change_type_choices
+        )
+        assert any(
+            choice["value"] == "fix"
+            for choice in conventional_commits.change_type_choices
+        )
+
+
+def test_extend_settings_do_not_leak_to_other_instances(config):
     config.settings["extend"] = {
-        "bump_map": {
-            "^foo": "MINOR",
-        }
+        "bump_map": {r"^foo": "MINOR"},
+        "change_type_choices": [
+            {
+                "value": "foo",
+                "name": "foo: custom type",
+                "key": "o",
+            }
+        ],
     }
+    first = ConventionalCommitsCz(config)
 
-    conventional_commits = ConventionalCommitsCz(config)
-    assert conventional_commits.bump_map == {"^bar": "PATCH"}
+    clean_config = config.__class__()
+    clean_config.settings.update({"name": "cz_conventional_commits"})
+    second = ConventionalCommitsCz(clean_config)
+
+    assert r"^foo" in first.bump_map
+    assert any(choice["value"] == "foo" for choice in first.change_type_choices)
+    assert r"^foo" not in second.bump_map
+    assert all(choice["value"] != "foo" for choice in second.change_type_choices)