feat: use connect_proj/user/studio instead of get_p/s/u

Author: faretek1

tests/test_auth.py

@@ -1,11 +1,11 @@
 import sys
 import os
-import util
 
 
 def test_import():
     sys.path.insert(0, ".")
+    import util
 
     assert "FERNET_KEY" in os.environ
     assert len(os.environ["FERNET_KEY"]) == 32
-    assert util.AUTH["test"]["note"]
+    assert util.session().username == "ScratchAttachV2"

tests/test_project.py

@@ -1,9 +1,13 @@
 import sys
 
+
 def test_get():
     sys.path.insert(0, ".")
     import scratchattach as sa
-    project = sa.get_project(1209355136)
+    from util import session
+    sess = session()
+
+    project = sess.connect_project(1209355136)
 
     assert project
     assert project.title == "Sample project #1"
@@ -22,7 +26,7 @@ def test_get():
     # studios
     comment = project.comments()[0]  # TODO: move this to a separate comment tester
     # comment_by_id
-    #comment_replies
+    # comment_replies
     # comment by id
     # (un)love
     # (un)favorite
@@ -38,7 +42,6 @@ def test_get():
     # set title/instruction/notes
     # visibility
 
-
     assert comment.id == 489648029
 
     remix = project.remixes()[0]
@@ -47,9 +50,10 @@ def test_get():
     assert remix.author_name == "ScratchAttachV2"
     assert remix.embed_url == "https://scratch.mit.edu/projects/1209582809/embed"
 
-    assert sa.get_project(414601586).moderation_status() == "notsafe"
-    assert sa.get_project(1207314193).moderation_status() == "safe"
-    assert sa.get_project(1233).moderation_status() == "notreviewed"  # if this becomes reviewed, please update this
+    assert sess.connect_project(414601586).moderation_status() == "notsafe"
+    assert sess.connect_project(1207314193).moderation_status() == "safe"
+    assert sess.connect_project(
+        1233).moderation_status() == "notreviewed"  # if this becomes reviewed, please update this
     # ^^ also this project is an infinite remix loop!
 
     assert sa.explore_projects()

tests/test_studio.py

@@ -4,8 +4,10 @@
 def test_import():
     sys.path.insert(0, ".")
     import scratchattach as sa
+    from util import session
+    sess = session()
 
-    studio = sa.get_studio(50809872)
+    studio = sess.connect_studio(50809872)
 
     assert studio.title == "Sample studio"
     assert studio.description == "Sample text"

tests/test_user.py

@@ -5,8 +5,10 @@
 def test_import():
     sys.path.insert(0, ".")
     import scratchattach as sa
+    from util import session
+    sess = session()
 
-    user = sa.get_user("ScratchAttachV2")
+    user = sess.connect_user("ScratchAttachV2")
 
     assert user.id == 147905216
     assert user.username == "ScratchAttachV2"
@@ -21,25 +23,25 @@ def test_import():
     assert user.classroom is None
     assert user.does_exist()
 
-    new_scratcher = sa.get_user("-NewScratcher-")
+    new_scratcher = sess.connect_user("-NewScratcher-")
     assert new_scratcher.is_new_scratcher()
     assert new_scratcher.rank() == sa.Rank.NEW_SCRATCHER
     assert not new_scratcher.scratchteam
 
-    ceebee = sa.get_user("ceebee")
+    ceebee = sess.connect_user("ceebee")
     assert not ceebee.is_new_scratcher()
     assert ceebee.scratchteam
     assert ceebee.rank() == sa.Rank.SCRATCH_TEAM
 
-    kaj = sa.get_user("kaj")
+    kaj = sess.connect_user("kaj")
     assert not kaj.does_exist()
     # If you request for a user that never existed using sa.get_user, you will get an error. So we construct a new user
     # here like so:
     assert not sa.User(username="_").does_exist()
 
     # status, bio
     # If the following is not the case, then a miracle has occurred
-    griffpatch = sa.get_user("griffpatch")
+    griffpatch = sess.connect_user("griffpatch")
     assert griffpatch.message_count() > 100
 
     assert user.featured_data() is None

tests/util/__init__.py

@@ -1,3 +1,21 @@
 # utility methods for testing
 # includes special handlers for authentication etc.
-from .keyhandler import AUTH
+import warnings
+
+from typing import Optional
+
+from .keyhandler import AUTH as __AUTH
+from scratchattach import login, Session as _Session, LoginDataWarning
+
+warnings.filterwarnings('ignore', category=LoginDataWarning)
+
+_session: Optional[_Session] = None
+
+
+def session() -> _Session:
+    global _session
+
+    if not _session:
+        _session = login("ScratchAttachV2", __AUTH["auth"]["scratchattachv2"])
+
+    return _session

tests/util/auth.toml

@@ -5,3 +5,6 @@
 [test]
 # this key is just used to test if auth is working
 note = "gAAAAABozoVANH3_fARiCOFvv-O6pHd8DU2kb5vzs7xIxzE3JoWnsFByK5LdoLnnfh0pXpmSpo0KS1j4uwl3XvF-Qm3Sm63Fwy_H224EAdqF_d2hWdVxJkn7HmAJTT445AyrtdFYgrg9"
+
+[auth]
+scratchattachv2="gAAAAABozo75u7Eov4zakrObMqLVs6wmwSNXQ7KroU5ntU7vZvM49fW-RnEWl1ZCnqIxAnjsPW5OUOBO2IS_MJYfuRl2CVNtaJojaO1s0uHk8_vZhh_YVMI="