Fix tests

Author: Buried-In-Code

docs/img/perdoo-archive.svg

@@ -6,7 +6,6 @@
 from perdoo.comic.archives import CBTArchive, CBZArchive
 from perdoo.comic.comic import Comic
 from perdoo.comic.metadata import ComicInfo, MetronInfo
-from perdoo.settings import Naming
 
 
 @pytest.fixture
@@ -78,6 +77,6 @@ def test_write_metadata_override(cbz_comic: Comic, metron_info: MetronInfo) -> N
 
 
 def test_rename(cbz_comic: Comic, metron_info: MetronInfo) -> None:
-    naming = generate_naming(settings=Naming(), metron_info=metron_info, comic_info=None)
+    naming = generate_naming(metron_info=metron_info, comic_info=None)
     cbz_comic.move_to(naming=naming, output_folder=cbz_comic.filepath.parent)
     assert cbz_comic.filepath.name == "Test-Series-v1_#.cbz"

docs/img/perdoo-commands.svg

@@ -1,8 +1,9 @@
 from pathlib import Path
+from unittest.mock import patch
 
 from perdoo.comic.metadata import ComicInfo
 from perdoo.comic.metadata._base import sanitize
-from perdoo.settings import Naming
+from perdoo.settings import Naming, Output, Settings
 
 
 def test_sanitize_basic() -> None:
@@ -18,8 +19,11 @@ def test_sanitize_none_and_empty() -> None:
 
 def test_evaluate_pattern() -> None:
     obj = ComicInfo(series="Series", volume=1, number=2, format="Single Issue", publisher="Pub")
-    settings = Naming(seperator="-", default="{series-name}-{unknown}-{number:03}")
-    name = obj.get_filename(settings=settings)
+    settings = Settings(
+        output=Output(naming=Naming(seperator="-", default="{series-name}-{unknown}-{number:03}"))
+    )
+    with patch("perdoo.comic.metadata.comic_info.SETTINGS", settings):
+        name = obj.get_filename()
 
     assert name == "Series-unknown-002"
 

docs/img/perdoo-process.svg

@@ -1,8 +1,9 @@
 from datetime import date
+from unittest.mock import patch
 
 from perdoo.comic.metadata import ComicInfo
 from perdoo.comic.metadata.comic_info import Page, PageType
-from perdoo.settings import Naming
+from perdoo.settings import Naming, Output, Settings
 
 
 def test_cover_date_property(comic_info: ComicInfo) -> None:
@@ -66,11 +67,16 @@ def test_get_filename_padding_and_sanitization() -> None:
         format="Single Issue",
         title="Hello: World / ???",
     )
-    settings = Naming(
-        seperator="-",
-        default="{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_#{number:02}-{title}",
+    settings = Settings(
+        output=Output(
+            naming=Naming(
+                seperator="-",
+                default="{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_#{number:02}-{title}",
+            )
+        )
     )
-    name = obj.get_filename(settings=settings)
+    with patch("perdoo.comic.metadata.comic_info.SETTINGS", settings):
+        name = obj.get_filename()
 
     assert "#02" in name
     assert "Hello-World" in name

docs/img/perdoo-settings.svg

@@ -1,4 +1,5 @@
 from datetime import date, datetime
+from unittest.mock import patch
 
 import pytest
 
@@ -13,7 +14,7 @@
     Resource,
     Role,
 )
-from perdoo.settings import Naming
+from perdoo.settings import Naming, Output, Settings
 
 
 def test_information_source_load_valid() -> None:
@@ -43,11 +44,16 @@ def test_get_filename_padding_and_sanitization(metron_info: MetronInfo) -> None:
         Id(primary=False, source=InformationSource.METRON, value="abc"),
         Id(primary=True, source=InformationSource.COMIC_VINE, value="cv-123"),
     ]
-    settings = Naming(
-        seperator="-",
-        default="{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_#{number:03}_{cover-year}_{id}",
+    settings = Settings(
+        output=Output(
+            naming=Naming(
+                seperator="-",
+                default="{publisher-name}/{series-name}-v{volume}/{series-name}-v{volume}_#{number:03}_{cover-year}_{id}",
+            )
+        )
     )
-    name = metron_info.get_filename(settings=settings)
+    with patch("perdoo.comic.metadata.metron_info.SETTINGS", settings):
+        name = metron_info.get_filename()
 
     assert "#002" in name
     assert "2021" in name
@@ -57,8 +63,13 @@ def test_get_filename_padding_and_sanitization(metron_info: MetronInfo) -> None:
 def test_pattern_map(metron_info: MetronInfo) -> None:
     metron_info.publisher = Publisher(name="Pub", imprint=Resource(value="Imprint Name"))
     metron_info.gtin = GTIN(isbn="9781234567890", upc="012345678905")
-    settings = Naming(seperator="-", default="{publisher-name}/{imprint}/{isbn}/{upc}")
-    name = metron_info.get_filename(settings=settings)
+    settings = Settings(
+        output=Output(
+            naming=Naming(seperator="-", default="{publisher-name}/{imprint}/{isbn}/{upc}")
+        )
+    )
+    with patch("perdoo.comic.metadata.metron_info.SETTINGS", settings):
+        name = metron_info.get_filename()
 
     assert "Pub" in name
     assert "Imprint-Name" in name