[themotte/rDrama#451] Sometimes we also want the user, not just their session

files/tests/fixture_accounts.py

@@ -2,37 +2,49 @@
 from . import util
 
 from bs4 import BeautifulSoup
-from files.__main__ import app
+from files.__main__ import app, db_session
+from files.classes import User
 from functools import lru_cache
 import pytest
 from time import time, sleep
 
 class AccountsFixture:
 	@lru_cache(maxsize=None)
-	def client_for_account(self, name = "default"):
+	def client_and_user_for_account(self, name):
-
 		client = app.test_client()
 
 		signup_get_response = client.get("/signup")
 		assert signup_get_response.status_code == 200
 		soup = BeautifulSoup(signup_get_response.text, 'html.parser')
 		# these hidden input values seem to be used for anti-bot purposes and need to be submitted
+		# The specific logic seems to be "if it took less than 5 seconds between getting
+		# the signup page and submitting it, you're probably a bot".
 		form_timestamp = next(tag for tag in soup.find_all("input") if tag.get("name") == "now").get("value")
 
 		username = f"test-{name}-{str(round(time()))}"
 		print(f"Signing up as {username}")
-		
+
 		signup_post_response = client.post("/signup", data={
 			"username": username,
 			"password": "password",
 			"password_confirm": "password",
 			"email": "",
 			"formkey": util.formkey_from(signup_get_response.text),
-			"now": form_timestamp
+			"now": form_timestamp,
 		})
+
 		assert signup_post_response.status_code == 302
 		assert "error" not in signup_post_response.location
 
+		db = db_session
+		user = db.query(User).filter_by(username=username).first()
+
+		assert User == type(user)
+
+		return client, user
+
+	def client_for_account(self, name = "default"):
+		client, user = client_and_user_for_account(name)
 		return client
 	
 	def logged_off(self):