Reorganize File class

2 files changed, 18 insertions, 12 deletions

diff --git a/tests/test_file_class.py b/tests/test_file_class.py
index 7ad0b87..dd30207 100644
--- a/tests/test_file_class.py
+++ b/tests/test_file_class.py
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Wikiget. If not, see <https://www.gnu.org/licenses/>.
 
+from wikiget import DEFAULT_SITE
 from wikiget.file import File
 
 
@@ -22,10 +23,15 @@ def test_file_with_name_only():
     file = File("foobar.jpg")
     assert file.name == "foobar.jpg"
     assert file.dest == file.name
+    assert file.site == DEFAULT_SITE
 
 
 def test_file_with_name_and_dest():
-    file = File("foobar.jpg", "bazqux.jpg")
-    assert file.name == "foobar.jpg"
+    file = File("foobar.jpg", dest="bazqux.jpg")
     assert file.dest == "bazqux.jpg"
     assert file.dest != file.name
+
+
+def test_file_with_name_and_site():
+    file = File("foobar.jpg", site="en.wikipedia.org")
+    assert file.site == "en.wikipedia.org"
diff --git a/tests/test_parse.py b/tests/test_parse.py
index c47678e..757b361 100644
--- a/tests/test_parse.py
+++ b/tests/test_parse.py
@@ -27,10 +27,10 @@ class TestGetDest:
 
     def test_get_dest_with_filename(self):
         args = self.parser.parse_args(["File:Example.jpg"])
-        filename, dest, site_name = get_dest(args.FILE, args)
-        assert filename == "Example.jpg"
-        assert dest == "Example.jpg"
-        assert site_name == "commons.wikimedia.org"
+        file = get_dest(args.FILE, args)
+        assert file.name == "Example.jpg"
+        assert file.dest == "Example.jpg"
+        assert file.site == "commons.wikimedia.org"
 
     def test_get_dest_with_url(self):
         args = self.parser.parse_args(
@@ -38,15 +38,15 @@ class TestGetDest:
                 "https://en.wikipedia.org/wiki/File:Example.jpg",
             ]
         )
-        filename, dest, site_name = get_dest(args.FILE, args)
-        assert filename == "Example.jpg"
-        assert dest == "Example.jpg"
-        assert site_name == "en.wikipedia.org"
+        file = get_dest(args.FILE, args)
+        assert file.name == "Example.jpg"
+        assert file.dest == "Example.jpg"
+        assert file.site == "en.wikipedia.org"
 
     def test_get_dest_with_bad_filename(self):
         args = self.parser.parse_args(["Example.jpg"])
         with pytest.raises(ParseError):
-            filename, dest, site_name = get_dest(args.FILE, args)
+            _ = get_dest(args.FILE, args)
 
     def test_get_dest_with_different_site(self, caplog: pytest.LogCaptureFixture):
         args = self.parser.parse_args(
@@ -56,5 +56,5 @@ class TestGetDest:
                 "commons.wikimedia.org",
             ]
         )
-        filename, dest, site_name = get_dest(args.FILE, args)
+        _ = get_dest(args.FILE, args)
         assert "Target is a URL, ignoring site specified with --site" in caplog.text