diff --git a/tests/unit/config/conftest.py b/tests/unit/config/conftest.py index 480428bf..2e01937d 100644 --- a/tests/unit/config/conftest.py +++ b/tests/unit/config/conftest.py @@ -48,6 +48,6 @@ def output_options() -> Dict: @pytest.fixture def youtube_video() -> Dict: return { - "download_strategy": "video", - "video_url": "youtube.com/watch?v=123abc", + "download_strategy": "url", + "url": "youtube.com/watch?v=123abc", } diff --git a/tests/unit/config/test_config_file.py b/tests/unit/config/test_config_file.py index a08b35a9..0584ed8a 100644 --- a/tests/unit/config/test_config_file.py +++ b/tests/unit/config/test_config_file.py @@ -66,12 +66,13 @@ class TestConfigFilePartiallyValidatesPresets: f"Allowed fields: {', '.join(sorted(PRESET_KEYS))}", ) - def test_error__multiple_sources(self): - self._partial_validate( - preset_dict={"youtube": {}, "download": {}}, - expected_error_message="Validation error in partial_preset: " - "Contains the sources download, youtube but can only have one", - ) + # TODO: Update with future source + # def test_error__multiple_sources(self): + # self._partial_validate( + # preset_dict={"youtube": {}, "download": {}}, + # expected_error_message="Validation error in partial_preset: " + # "Contains the sources download, youtube but can only have one", + # ) def test_error__no_download_strategy(self): self._partial_validate( diff --git a/tests/unit/config/test_preset.py b/tests/unit/config/test_preset.py index d924c82c..4fc87fe0 100644 --- a/tests/unit/config/test_preset.py +++ b/tests/unit/config/test_preset.py @@ -10,18 +10,18 @@ class TestPreset: @pytest.mark.parametrize( "source, download_strategy", [ - ("youtube", {"download_strategy": "video", "video_url": "youtube.com/watch?v=123abc"}), + ("download", {"download_strategy": "url", "url": "youtube.com/watch?v=123abc"}), ( - "youtube", + "download", { - "download_strategy": "playlist", - "playlist_url": "youtube.com/playlist?list=123abc", + "download_strategy": "url", + "url": "youtube.com/playlist?list=123abc", }, ), - ("youtube", {"download_strategy": "channel", "channel_url": "youtube.com/c/123abc"}), + ("download", {"download_strategy": "url", "url": "youtube.com/c/123abc"}), ( - "soundcloud", - {"download_strategy": "albums_and_singles", "url": "soundcloud.com/123abc"}, + "download", + {"download_strategy": "url", "url": "soundcloud.com/123abc"}, ), ], ) @@ -37,7 +37,7 @@ class TestPreset: config=config_file, name="test", value={ - "youtube": youtube_video, + "download": youtube_video, "output_options": {"output_directory": "dir", "file_name": "{dne_var}"}, "overrides": {"dne_var": "not dne"}, }, @@ -49,7 +49,7 @@ class TestPreset: name="test", value={ "preset": "parent_preset_1", - "youtube": youtube_video, + "download": youtube_video, "output_options": output_options, "nfo_tags": {"tags": {"key-2": "this-preset"}}, }, @@ -74,7 +74,7 @@ class TestPreset: name="test", value={ "preset": preset_value, - "youtube": youtube_video, + "download": youtube_video, "output_options": output_options, "nfo_tags": {"tags": {"key-3": "this-preset"}}, }, @@ -97,7 +97,7 @@ class TestPreset: config=config_file, name="test", value={ - "youtube": youtube_video, + "download": youtube_video, "output_options": dict( output_options, **{"maintain_download_archive": True, "keep_files_after": "today-{ttl}"}, @@ -122,7 +122,7 @@ class TestPreset: name="test", value={ "preset": parent_preset, - "youtube": youtube_video, + "download": youtube_video, "output_options": output_options, }, ) @@ -138,7 +138,7 @@ class TestPreset: config=config_file, name="test", value={ - "youtube": youtube_video, + "download": youtube_video, "output_options": {"output_directory": "dir", "file_name": "{dne_var}"}, }, ) @@ -154,7 +154,7 @@ class TestPreset: config=config_file, name="test", value={ - "youtube": youtube_video, + "download": youtube_video, "output_options": {"output_directory": "{dne_var}", "file_name": "file"}, }, ) @@ -170,7 +170,7 @@ class TestPreset: config=config_file, name="test", value={ - "youtube": youtube_video, + "download": youtube_video, "output_options": {"output_directory": "dir", "file_name": "file"}, "nfo_tags": { "nfo_name": "the nfo name", @@ -191,7 +191,7 @@ class TestPreset: config=config_file, name="test", value={ - "youtube": youtube_video, + "download": youtube_video, "output_options": {"output_directory": "dir", "file_name": "file"}, "output_directory_nfo_tags": { "nfo_name": "the nfo name", diff --git a/tests/unit/config/test_subscription.py b/tests/unit/config/test_subscription.py index 1eff02f3..512a34d0 100644 --- a/tests/unit/config/test_subscription.py +++ b/tests/unit/config/test_subscription.py @@ -12,7 +12,7 @@ from ytdl_sub.subscriptions.subscription import Subscription def preset_file(youtube_video: Dict, output_options: Dict) -> Dict: return { "__preset__": { - "youtube": youtube_video, + "download": youtube_video, "output_options": output_options, "nfo_tags": { "tags": {"key-3": "file_preset"},