diff --git a/comictaggerlib/comiccacher.py b/comictaggerlib/comiccacher.py index a48fe45..3eb1c91 100644 --- a/comictaggerlib/comiccacher.py +++ b/comictaggerlib/comiccacher.py @@ -379,8 +379,8 @@ class ComicCacher: def add_issue_select_details( self, - issue_id: int, source_name: str, + issue_id: int, image_url: str, thumb_image_url: str, cover_date: str, diff --git a/comictaggerlib/comicvinetalker.py b/comictaggerlib/comicvinetalker.py index dabeea0..8b845f1 100644 --- a/comictaggerlib/comicvinetalker.py +++ b/comictaggerlib/comicvinetalker.py @@ -677,7 +677,7 @@ class ComicVineTalker: self, issue_id: int, image_url: str, thumb_url: str, cover_date: str, page_url: str ) -> None: cvc = ComicCacher() - cvc.add_issue_select_details(issue_id, self.source_name, image_url, thumb_url, cover_date, page_url) + cvc.add_issue_select_details(self.source_name, issue_id, image_url, thumb_url, cover_date, page_url) def fetch_alternate_cover_urls(self, issue_id: int, issue_page_url: str) -> list[str]: url_list = self.fetch_cached_alternate_cover_urls(issue_id) diff --git a/tests/comiccacher_test.py b/tests/comiccacher_test.py index be5d011..5ae7cd1 100644 --- a/tests/comiccacher_test.py +++ b/tests/comiccacher_test.py @@ -38,7 +38,7 @@ def test_volume_info(comic_cache, volume_info): @pytest.mark.parametrize("details", select_details) def test_issue_select_details(comic_cache, details): - comic_cache.add_issue_select_details(**details) + comic_cache.add_issue_select_details(**details, source_name="test") det = details.copy() del det["issue_id"] assert det == comic_cache.get_issue_select_details(details["issue_id"], "test") diff --git a/tests/comicvinetalker_test.py b/tests/comicvinetalker_test.py index 2d057f7..56b0ce8 100644 --- a/tests/comicvinetalker_test.py +++ b/tests/comicvinetalker_test.py @@ -16,7 +16,7 @@ def test_fetch_volume_data(comicvine_api, settings, mock_now, comic_cache): assert volume == comic_cache.get_volume_info(23437, ct.source_name) -def test_fetch_issue_data_by_issue_id(comicvine_api, settings, mock_now): +def test_fetch_issue_data_by_issue_id(comicvine_api, settings, mock_now, mock_version): ct = comictaggerlib.comicvinetalker.ComicVineTalker() md = ct.fetch_issue_data_by_issue_id(311811, settings) assert md == testing.comicvine.cv_md diff --git a/tests/conftest.py b/tests/conftest.py index 5f88470..f3a9659 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -56,6 +56,17 @@ def mock_now(monkeypatch): monkeypatch.setattr(comictaggerlib.comicvinetalker, "datetime", mydatetime) +@pytest.fixture +def mock_version(monkeypatch): + version = "1.4.4a9.dev20" + version_tuple = (1, 4, 4, "dev20") + + monkeypatch.setattr(comictaggerlib.ctversion, "version", version) + monkeypatch.setattr(comictaggerlib.ctversion, "__version__", version) + monkeypatch.setattr(comictaggerlib.ctversion, "version_tuple", version_tuple) + monkeypatch.setattr(comictaggerlib.ctversion, "__version_tuple__", version_tuple) + + @pytest.fixture def md(): yield dataclasses.replace(comicapi.genericmetadata.md_test)