Merge branch 'refactor-api-query' into dev

2 files changed, 45 insertions, 16 deletions

diff --git a/tests/test_client.py b/tests/test_client.py
new file mode 100644
index 0000000..448ab67
--- /dev/null
+++ b/tests/test_client.py
@@ -0,0 +1,43 @@
+# wikiget - CLI tool for downloading files from Wikimedia sites
+# Copyright (C) 2023 Cody Logan
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# Wikiget is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Wikiget is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Wikiget. If not, see <https://www.gnu.org/licenses/>.
+
+import logging
+
+import pytest
+
+from wikiget import USER_AGENT
+from wikiget.client import connect_to_site, query_api
+from wikiget.wikiget import construct_parser
+
+
+# TODO: don't hit the actual API when doing tests
+@pytest.mark.skip(reason="skip tests that query a live API")
+class TestQueryApi:
+    parser = construct_parser()
+
+    def test_connect_to_site(self, caplog: pytest.LogCaptureFixture) -> None:
+        caplog.set_level(logging.DEBUG)
+        args = self.parser.parse_args(["File:Example.jpg"])
+        _ = connect_to_site("commons.wikimedia.org", args)
+        assert "Connecting to commons.wikimedia.org" in caplog.text
+
+    def test_query_api(self, caplog: pytest.LogCaptureFixture) -> None:
+        caplog.set_level(logging.DEBUG)
+        args = self.parser.parse_args(["File:Example.jpg"])
+        site = connect_to_site("commons.wikimedia.org", args)
+        _ = query_api("Example.jpg", site)
+        assert USER_AGENT in caplog.text
diff --git a/tests/test_dl.py b/tests/test_dl.py
index 839cdee..c0dcf0c 100644
--- a/tests/test_dl.py
+++ b/tests/test_dl.py
@@ -15,28 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with Wikiget. If not, see <https://www.gnu.org/licenses/>.
 
-import logging
-
 import pytest
 
-from wikiget import USER_AGENT
-from wikiget.dl import prep_download, query_api
+from wikiget.dl import prep_download
 from wikiget.wikiget import construct_parser
 
 
 # TODO: don't hit the actual API when doing tests
-@pytest.mark.skip
-class TestQueryApi:
-    parser = construct_parser()
-
-    def test_query_api(self, caplog: pytest.LogCaptureFixture) -> None:
-        caplog.set_level(logging.DEBUG)
-        args = self.parser.parse_args(["File:Example.jpg"])
-        file, site = query_api("Example.jpg", "commons.wikimedia.org", args)
-        assert USER_AGENT in caplog.text
-
-
-@pytest.mark.skip
+@pytest.mark.skip(reason="skip tests that query a live API")
 class TestPrepDownload:
     parser = construct_parser()