Address code review feedback: improve test isolation and simplify variable usage

Co-authored-by: miroslavpojer <[email protected]>

Author: Copilot

release_notes_generator/chapters/custom_chapters.py

@@ -100,16 +100,15 @@ def populate(self, records: dict[str, Record]) -> None:
                 if any(lbl in ch.labels for lbl in record_labels):
                     if record_id not in ch.rows:
                         # Only count toward duplicity for visible (non-hidden) chapters
-                        is_hidden = ch.hidden
-                        if not is_hidden:
+                        if not ch.hidden:
                             record.add_to_chapter_presence(ch.title)
                         # For hidden chapters: don't increment duplicity counter
                         # For visible chapters: increment duplicity counter (existing behavior)
-                        ch.add_row(record_id, record.to_chapter_row(not is_hidden))
+                        ch.add_row(record_id, record.to_chapter_row(not ch.hidden))
                         # Track for backward compatibility (not used for gating anymore)
                         if record_id not in self.populated_record_numbers_list:
                             self.populated_record_numbers_list.append(record_id)
-                        if is_hidden and ActionInputs.get_verbose():
+                        if ch.hidden and ActionInputs.get_verbose():
                             logger.debug(
                                 "Record %s assigned to hidden chapter '%s' (not counted for duplicity)",
                                 record_id,

tests/unit/release_notes_generator/chapters/test_custom_chapters.py

@@ -523,47 +523,35 @@ def test_to_string_hidden_empty_chapter_not_shown():
     assert result == ""
 
 
-def test_to_string_debug_logging_for_hidden(caplog):
+def test_to_string_debug_logging_for_hidden(caplog, monkeypatch):
     # Arrange
     caplog.set_level("DEBUG")
     cc = CustomChapters()
     cc.from_yaml_array([{"title": "Hidden", "labels": "bug", "hidden": True}])
     cc.chapters["Hidden"].add_row(1, "Bug fix")
     # Mock verbose mode
-    import release_notes_generator.action_inputs
-    original_get_verbose = release_notes_generator.action_inputs.ActionInputs.get_verbose
-    release_notes_generator.action_inputs.ActionInputs.get_verbose = staticmethod(lambda: True)
+    monkeypatch.setattr(ActionInputs, "get_verbose", staticmethod(lambda: True))
     # Act
-    try:
-        cc.to_string()
-        # Assert
-        assert any("Skipping hidden chapter" in r.message for r in caplog.records)
-        assert any("Hidden" in r.message and "1 records tracked" in r.message for r in caplog.records)
-    finally:
-        # Restore
-        release_notes_generator.action_inputs.ActionInputs.get_verbose = original_get_verbose
+    cc.to_string()
+    # Assert
+    assert any("Skipping hidden chapter" in r.message for r in caplog.records)
+    assert any("Hidden" in r.message and "1 records tracked" in r.message for r in caplog.records)
 
 
-def test_populate_debug_logging_for_hidden_assignment(record_stub, caplog):
+def test_populate_debug_logging_for_hidden_assignment(record_stub, caplog, monkeypatch):
     # Arrange
     caplog.set_level("DEBUG")
     cc = CustomChapters()
     cc.from_yaml_array([{"title": "Hidden", "labels": "bug", "hidden": True}])
     record = record_stub("org/repo#1", ["bug"])
     records = {"org/repo#1": record}
     # Mock verbose mode
-    import release_notes_generator.action_inputs
-    original_get_verbose = release_notes_generator.action_inputs.ActionInputs.get_verbose
-    release_notes_generator.action_inputs.ActionInputs.get_verbose = staticmethod(lambda: True)
+    monkeypatch.setattr(ActionInputs, "get_verbose", staticmethod(lambda: True))
     # Act
-    try:
-        cc.populate(records)
-        # Assert
-        assert any("assigned to hidden chapter" in r.message.lower() for r in caplog.records)
-        assert any("not counted for duplicity" in r.message.lower() for r in caplog.records)
-    finally:
-        # Restore
-        release_notes_generator.action_inputs.ActionInputs.get_verbose = original_get_verbose
+    cc.populate(records)
+    # Assert
+    assert any("assigned to hidden chapter" in r.message.lower() for r in caplog.records)
+    assert any("not counted for duplicity" in r.message.lower() for r in caplog.records)
 
 
 def test_hidden_chapter_info_logging(caplog):