Skip to content

Commit feceee2

Browse files
Buried-In-CodeBuried-In-Code
committed
Fix tests
1 parent cf9d0d2 commit feceee2

3 files changed

Lines changed: 36 additions & 33 deletions

File tree

‎tests/services/comicvine_test.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from unittest.mock import MagicMock, patch
22

33
import pytest
4-
from rich.prompt import Confirm
54
from simyan.schemas.issue import Issue
65
from simyan.schemas.volume import Volume
76

@@ -32,34 +31,36 @@ def test_search_series(service: Comicvine, volume_mock: Volume) -> None:
3231
patch("perdoo.services.comicvine.select") as select_mock,
3332
):
3433
select_mock.return_value.ask.return_value = volume_mock
35-
found = service._search_series(name="Venom", volume=None, year=None) # noqa: SLF001
34+
found = service._search_series(name="Venom", volume=None, year=None, filename="Venom") # noqa: SLF001
3635
assert found == volume_mock.id
3736

3837

3938
def test_search_series_default(service: Comicvine, volume_mock: Volume) -> None:
4039
with (
4140
patch.object(service.session, "list_volumes", return_value=[volume_mock, volume_mock]),
4241
patch("perdoo.services.comicvine.select") as select_mock,
43-
patch.object(Confirm, "ask", return_value=False),
42+
patch("perdoo.services.comicvine.confirm") as confirm_mock,
4443
):
4544
select_mock.return_value.ask.return_value = DEFAULT_CHOICE.title
46-
found = service._search_series(name="Venom", volume=None, year=None) # noqa: SLF001
45+
confirm_mock.return_value.ask.return_value = False
46+
found = service._search_series(name="Venom", volume=None, year=None, filename="Venom") # noqa: SLF001
4747
assert found is None
4848

4949

5050
def test_search_series_no_results(service: Comicvine) -> None:
5151
with (
5252
patch.object(service.session, "list_volumes", return_value=[]),
53-
patch.object(Confirm, "ask", return_value=False),
53+
patch("perdoo.services.comicvine.confirm") as confirm_mock,
5454
):
55-
found = service._search_series(name="Venom", volume=None, year=None) # noqa: SLF001
55+
confirm_mock.return_value.ask.return_value = False
56+
found = service._search_series(name="Venom", volume=None, year=None, filename="Venom") # noqa: SLF001
5657
assert found is None
5758

5859

5960
def test_fetch_series(service: Comicvine, volume_mock: Volume) -> None:
6061
with patch.object(service.session, "get_volume", return_value=volume_mock):
6162
mock_search = SeriesSearch(name="Venom", comicvine=volume_mock.id)
62-
found = service.fetch_series(search=mock_search)
63+
found = service.fetch_series(search=mock_search, filename="Venom")
6364
assert found == volume_mock
6465

6566

@@ -69,7 +70,7 @@ def test_search_issues(service: Comicvine, issue_mock: Issue) -> None:
6970
patch("perdoo.services.comicvine.select") as mock_select,
7071
):
7172
mock_select.return_value.ask.return_value = issue_mock
72-
found = service._search_issue(series_id=466, number="1") # noqa: SLF001
73+
found = service._search_issue(series_id=466, number="1", filename="Venom") # noqa: SLF001
7374
assert found == issue_mock.id
7475

7576

@@ -79,18 +80,18 @@ def test_search_issues_default(service: Comicvine, issue_mock: Issue) -> None:
7980
patch("perdoo.services.comicvine.select") as select_mock,
8081
):
8182
select_mock.return_value.ask.return_value = DEFAULT_CHOICE.title
82-
found = service._search_issue(series_id=466, number="1") # noqa: SLF001
83+
found = service._search_issue(series_id=466, number="1", filename="Venom") # noqa: SLF001
8384
assert found is None
8485

8586

8687
def test_search_issues_no_results(service: Comicvine) -> None:
8788
with patch.object(service.session, "list_issues", return_value=[]):
88-
found = service._search_issue(series_id=466, number="1") # noqa: SLF001
89+
found = service._search_issue(series_id=466, number="1", filename="Venom") # noqa: SLF001
8990
assert found is None
9091

9192

9293
def test_fetch_issue(service: Comicvine, issue_mock: Issue) -> None:
9394
with patch.object(service.session, "get_issue", return_value=issue_mock):
9495
mock_search = IssueSearch(comicvine=issue_mock.id)
95-
found = service.fetch_issue(series_id=466, search=mock_search)
96+
found = service.fetch_issue(series_id=466, search=mock_search, filename="Venom")
9697
assert found == issue_mock

‎tests/services/marvel_test.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import pytest
44
from esak.schemas.comic import Comic
55
from esak.schemas.series import Series
6-
from rich.prompt import Confirm
76

87
from perdoo.services.marvel import DEFAULT_CHOICE, Marvel
98
from perdoo.settings import Marvel as MarvelSettings
@@ -32,34 +31,36 @@ def test_search_series(service: Marvel, series_mock: Series) -> None:
3231
patch("perdoo.services.marvel.select") as mock_select,
3332
):
3433
mock_select.return_value.ask.return_value = series_mock
35-
found = service._search_series(name="Venom", volume=None, year=None) # noqa: SLF001
34+
found = service._search_series(name="Venom", volume=None, year=None, filename="Venom") # noqa: SLF001
3635
assert found == series_mock.id
3736

3837

3938
def test_search_series_default(service: Marvel, series_mock: Series) -> None:
4039
with (
4140
patch.object(service.session, "series_list", return_value=[series_mock, series_mock]),
4241
patch("perdoo.services.marvel.select") as select_mock,
43-
patch.object(Confirm, "ask", return_value=False),
42+
patch("perdoo.services.marvel.confirm") as confirm_mock,
4443
):
4544
select_mock.return_value.ask.return_value = DEFAULT_CHOICE.title
46-
found = service._search_series(name="Venom", volume=None, year=None) # noqa: SLF001
45+
confirm_mock.return_value.ask.return_value = False
46+
found = service._search_series(name="Venom", volume=None, year=None, filename="Venom") # noqa: SLF001
4747
assert found is None
4848

4949

5050
def test_search_series_no_results(service: Marvel) -> None:
5151
with (
5252
patch.object(service.session, "series_list", return_value=[]),
53-
patch.object(Confirm, "ask", return_value=False),
53+
patch("perdoo.services.marvel.confirm") as confirm_mock,
5454
):
55-
found = service._search_series(name="Venom", volume=None, year=None) # noqa: SLF001
55+
confirm_mock.return_value.ask.return_value = False
56+
found = service._search_series(name="Venom", volume=None, year=None, filename="Venom") # noqa: SLF001
5657
assert found is None
5758

5859

5960
def test_fetch_series(service: Marvel, series_mock: Series) -> None:
6061
with patch.object(service.session, "series", return_value=series_mock):
6162
mock_search = SeriesSearch(name="Venom", marvel=series_mock.id)
62-
found = service.fetch_series(search=mock_search)
63+
found = service.fetch_series(search=mock_search, filename="Venom")
6364
assert found == series_mock
6465

6566

@@ -69,7 +70,7 @@ def test_search_issues(service: Marvel, comic_mock: Comic) -> None:
6970
patch("perdoo.services.marvel.select") as mock_select,
7071
):
7172
mock_select.return_value.ask.return_value = comic_mock
72-
found = service._search_issue(series_id=466, number="1") # noqa: SLF001
73+
found = service._search_issue(series_id=466, number="1", filename="Venom") # noqa: SLF001
7374
assert found == comic_mock.id
7475

7576

@@ -79,18 +80,18 @@ def test_search_issues_default(service: Marvel, comic_mock: Comic) -> None:
7980
patch("perdoo.services.marvel.select") as select_mock,
8081
):
8182
select_mock.return_value.ask.return_value = DEFAULT_CHOICE.title
82-
found = service._search_issue(series_id=466, number="1") # noqa: SLF001
83+
found = service._search_issue(series_id=466, number="1", filename="Venom") # noqa: SLF001
8384
assert found is None
8485

8586

8687
def test_search_issues_no_results(service: Marvel) -> None:
8788
with patch.object(service.session, "comics_list", return_value=[]):
88-
found = service._search_issue(series_id=466, number="1") # noqa: SLF001
89+
found = service._search_issue(series_id=466, number="1", filename="Venom") # noqa: SLF001
8990
assert found is None
9091

9192

9293
def test_fetch_issue(service: Marvel, comic_mock: Comic) -> None:
9394
with patch.object(service.session, "comic", return_value=comic_mock):
9495
mock_search = IssueSearch(marvel=comic_mock.id)
95-
found = service.fetch_issue(series_id=466, search=mock_search)
96+
found = service.fetch_issue(series_id=466, search=mock_search, filename="Venom")
9697
assert found == comic_mock

‎tests/services/metron_test.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import pytest
44
from mokkari.schemas.issue import Issue
55
from mokkari.schemas.series import Series
6-
from rich.prompt import Confirm
76

87
from perdoo.services.metron import DEFAULT_CHOICE, Metron
98
from perdoo.settings import Metron as MetronSettings
@@ -39,34 +38,36 @@ def test_search_series(service: Metron, series_mock: Series) -> None:
3938
patch("perdoo.services.metron.select") as select_mock,
4039
):
4140
select_mock.return_value.ask.return_value = series_mock
42-
found = service._search_series(name="Venom", volume=None, year=None) # noqa: SLF001
41+
found = service._search_series(name="Venom", volume=None, year=None, filename="Venom") # noqa: SLF001
4342
assert found == series_mock.id
4443

4544

4645
def test_search_series_default(service: Metron, series_mock: Series) -> None:
4746
with (
4847
patch.object(service.session, "series_list", return_value=[series_mock, series_mock]),
4948
patch("perdoo.services.metron.select") as select_mock,
50-
patch.object(Confirm, "ask", return_value=False),
49+
patch("perdoo.services.metron.confirm") as confirm_mock,
5150
):
5251
select_mock.return_value.ask.return_value = DEFAULT_CHOICE.title
53-
found = service._search_series(name="Venom", volume=None, year=None) # noqa: SLF001
52+
confirm_mock.return_value.ask.return_value = False
53+
found = service._search_series(name="Venom", volume=None, year=None, filename="Venom") # noqa: SLF001
5454
assert found is None
5555

5656

5757
def test_search_series_no_results(service: Metron) -> None:
5858
with (
5959
patch.object(service.session, "series_list", return_value=[]),
60-
patch.object(Confirm, "ask", return_value=False),
60+
patch("perdoo.services.metron.confirm") as confirm_mock,
6161
):
62-
found = service._search_series(name="Venom", volume=None, year=None) # noqa: SLF001
62+
confirm_mock.return_value.ask.return_value = False
63+
found = service._search_series(name="Venom", volume=None, year=None, filename="Venom") # noqa: SLF001
6364
assert found is None
6465

6566

6667
def test_fetch_series(service: Metron, series_mock: Series) -> None:
6768
with patch.object(service.session, "series", return_value=series_mock):
6869
mock_search = SeriesSearch(name="Venom", metron=series_mock.id)
69-
found = service.fetch_series(search=mock_search)
70+
found = service.fetch_series(search=mock_search, filename="Venom")
7071
assert found == series_mock
7172

7273

@@ -81,7 +82,7 @@ def test_search_issues(service: Metron, issue_mock: Issue) -> None:
8182
patch("perdoo.services.metron.select") as mock_select,
8283
):
8384
mock_select.return_value.ask.return_value = issue_mock
84-
found = service._search_issue(series_id=466, number="1") # noqa: SLF001
85+
found = service._search_issue(series_id=466, number="1", filename="Venom") # noqa: SLF001
8586
assert found == issue_mock.id
8687

8788

@@ -91,18 +92,18 @@ def test_search_issues_default(service: Metron, issue_mock: Issue) -> None:
9192
patch("perdoo.services.metron.select") as select_mock,
9293
):
9394
select_mock.return_value.ask.return_value = DEFAULT_CHOICE.title
94-
found = service._search_issue(series_id=466, number="1") # noqa: SLF001
95+
found = service._search_issue(series_id=466, number="1", filename="Venom") # noqa: SLF001
9596
assert found is None
9697

9798

9899
def test_search_issues_no_results(service: Metron) -> None:
99100
with patch.object(service.session, "issues_list", return_value=[]):
100-
found = service._search_issue(series_id=466, number="1") # noqa: SLF001
101+
found = service._search_issue(series_id=466, number="1", filename="Venom") # noqa: SLF001
101102
assert found is None
102103

103104

104105
def test_fetch_issue(service: Metron, issue_mock: Issue) -> None:
105106
with patch.object(service.session, "issue", return_value=issue_mock):
106107
mock_search = IssueSearch(metron=issue_mock.id)
107-
found = service.fetch_issue(series_id=466, search=mock_search)
108+
found = service.fetch_issue(series_id=466, search=mock_search, filename="Venom")
108109
assert found == issue_mock

0 commit comments

Comments
 (0)