Fix build

misago/threads/tests/test_privatethread_reply_api.py

@@ -32,7 +32,8 @@ class PrivateThreadReplyApiTestCase(PrivateThreadsTestCase):
         self.assertEqual(self.user.audittrail_set.count(), 1)
 
         # valid user was flagged to sync
-        self.assertFalse(User.objects.get(pk=self.user.pk).sync_unread_private_threads)
-        self.assertTrue(
-            User.objects.get(pk=self.other_user.pk).sync_unread_private_threads
-        )
+        self.user.refresh_from_db()
+        self.assertFalse(self.user.sync_unread_private_threads)
+
+        self.other_user.refresh_from_db()
+        self.assertTrue(self.other_user.sync_unread_private_threads)

misago/threads/tests/test_privatethread_start_api.py

@@ -1,3 +1,4 @@
+from django.contrib.auth import get_user_model
 from django.core import mail
 from django.urls import reverse
 from django.utils.encoding import smart_str
@@ -8,6 +9,8 @@ from misago.threads.models import ThreadParticipant
 from misago.threads.test import other_user_cant_use_private_threads
 from misago.users.testutils import AuthenticatedUserTestCase, create_test_user
 
+User = get_user_model()
+
 
 class StartPrivateThreadTests(AuthenticatedUserTestCase):
     def setUp(self):
@@ -166,7 +169,7 @@ class StartPrivateThreadTests(AuthenticatedUserTestCase):
         self.assertEqual(response.status_code, 400)
         self.assertEqual(
             response.json(),
-            {"to": ["BobBoberson can't participate in private threads."]},
+            {"to": ["OtherUser can't participate in private threads."]},
         )
 
     def test_cant_invite_blocking(self):
@@ -183,7 +186,7 @@ class StartPrivateThreadTests(AuthenticatedUserTestCase):
         )
 
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(response.json(), {"to": ["BobBoberson is blocking you."]})
+        self.assertEqual(response.json(), {"to": ["OtherUser is blocking you."]})
 
     @patch_user_acl({"can_add_everyone_to_private_threads": 1})
     def test_cant_invite_blocking_override(self):
@@ -225,7 +228,7 @@ class StartPrivateThreadTests(AuthenticatedUserTestCase):
             response.json(),
             {
                 "to": [
-                    "BobBoberson limits invitations to private threads to followed users."
+                    "OtherUser limits invitations to private threads to followed users."
                 ]
             },
         )
@@ -283,7 +286,7 @@ class StartPrivateThreadTests(AuthenticatedUserTestCase):
         self.assertEqual(response.status_code, 400)
         self.assertEqual(
             response.json(),
-            {"to": ["BobBoberson is not allowing invitations to private threads."]},
+            {"to": ["OtherUser is not allowing invitations to private threads."]},
         )
 
         # allow us to bypass user preference check
@@ -359,8 +362,8 @@ class StartPrivateThreadTests(AuthenticatedUserTestCase):
         )
 
         # other user has sync_unread_private_threads flag
-        user_to_sync = User.objects.get(sync_unread_private_threads=True)
-        self.assertEqual(user_to_sync, self.other_user)
+        self.other_user.refresh_from_db()
+        self.assertTrue(self.other_user.sync_unread_private_threads)
 
         # notification about new private thread was sent to other user
         self.assertEqual(len(mail.outbox), 1)

misago/users/tests/test_avatars.py

@@ -90,9 +90,7 @@ class AvatarsStoreTests(TestCase):
 
 class AvatarSetterTests(TestCase):
     def setUp(self):
-        user = create_test_user("User", "user@example.com")
-        self.user.avatars = None
-        self.user.save()
+        self.user = create_test_user("User", "user@example.com", avatars=None)
 
     def tearDown(self):
         store.delete_avatar(self.user)
@@ -150,6 +148,7 @@ class AvatarSetterTests(TestCase):
     def test_gravatar(self):
         """dynamic avatar gets created"""
         self.assertNoAvatarIsSet()
+        self.user.set_email("rafio.xudb@gmail.com")
         gravatar.set_avatar(self.user)
         self.assertAvatarWasSet()
 

misago/users/tests/test_avatarserver_views.py

@@ -12,7 +12,7 @@ class AvatarServerTests(TestCase):
     def test_get_user_avatar_exact_size(self):
         """avatar server resolved valid avatar url for user"""
         avatar_url = reverse(
-            "misago:user-avatar", kwargs={"pk": self.user.pk, "size": 100}
+            "misago:user-avatar", kwargs={"pk": self.user.pk, "size": 200}
         )
 
         response = self.client.get(avatar_url)
@@ -23,7 +23,7 @@ class AvatarServerTests(TestCase):
     def test_get_user_avatar_inexact_size(self):
         """avatar server resolved valid avatar fallback for user"""
         avatar_url = reverse(
-            "misago:user-avatar", kwargs={"pk": self.user.pk, "size": 150}
+            "misago:user-avatar", kwargs={"pk": self.user.pk, "size": 250}
         )
 
         response = self.client.get(avatar_url)

misago/users/tests/test_forgottenpassword_views.py

@@ -38,7 +38,7 @@ class ForgottenPasswordViewsTests(UserTestCase):
         )
 
         Ban.objects.create(
-            check_type=Ban.USERNAME, banned_value="bob", user_message="Nope!"
+            check_type=Ban.USERNAME, banned_value="OtherUser", user_message="Nope!"
         )
 
         password_token = make_password_change_token(user)

misago/users/tests/test_invalidatebans.py

@@ -69,5 +69,5 @@ class InvalidateBansTests(TestCase):
         self.assertEqual(Ban.objects.filter(is_checked=True).count(), 0)
 
         # see if user is banned anymore
-        user.refresh_from_db()
+        user.ban_cache = None
         self.assertIsNone(bans.get_user_ban(user, get_cache_versions()))

misago/users/tests/test_user_username_api.py

@@ -145,20 +145,19 @@ class UserUsernameModerationTests(AuthenticatedUserTestCase):
 
         response = self.client.post(
             self.link,
-            json.dumps({"username": "BobBoberson"}),
+            json.dumps({"username": "NewName"}),
             content_type="application/json",
         )
 
         self.assertEqual(response.status_code, 200)
 
-        other_user.refresh_from_db()
-
-        self.assertEqual("BobBoberson", other_user.username)
-        self.assertEqual("bobboberson", other_user.slug)
+        self.other_user.refresh_from_db()
+        self.assertEqual("NewName", self.other_user.username)
+        self.assertEqual("newname", self.other_user.slug)
 
         options = response.json()
-        self.assertEqual(options["username"], other_user.username)
-        self.assertEqual(options["slug"], other_user.slug)
+        self.assertEqual(options["username"], self.other_user.username)
+        self.assertEqual(options["slug"], self.other_user.slug)
 
     @patch_user_acl({"can_rename_users": 1})
     def test_moderate_own_username(self):