Browse Source

Move username generator under the user module

rafalp 6 years ago
parent
commit
e7a0629d98
3 changed files with 16 additions and 18 deletions
  1. 1 1
      misago/faker/tests/test_fake_username.py
  2. 15 1
      misago/faker/user.py
  3. 0 16
      misago/faker/username.py

+ 1 - 1
misago/faker/tests/test_fake_username.py

@@ -1,4 +1,4 @@
-from ..username import get_fake_username
+from ..user import get_fake_username
 
 
 def test_fake_username_can_be_created(fake):

+ 15 - 1
misago/faker/user.py

@@ -1,8 +1,10 @@
+import random
+
 from django.contrib.auth import get_user_model
+from django.utils.crypto import get_random_string
 
 from ..users.bans import ban_user
 from ..users.test import create_test_user
-from .username import get_fake_username
 from .utils import retry_on_db_error
 
 User = get_user_model()
@@ -34,3 +36,15 @@ def get_fake_inactive_user(fake, rank=None):
 
 def get_fake_admin_activated_user(fake, rank=None):
     return get_fake_user(fake, rank=rank, requires_activation=User.ACTIVATION_ADMIN)
+
+
+def get_fake_username(fake):
+    possible_usernames = [
+        fake.first_name(),
+        fake.last_name(),
+        fake.name().replace(" ", ""),
+        fake.user_name(),
+        get_random_string(random.randint(4, 8)),
+    ]
+
+    return random.choice(possible_usernames)

+ 0 - 16
misago/faker/username.py

@@ -1,16 +0,0 @@
-import random
-
-from django.utils.crypto import get_random_string
-from faker import Factory
-
-
-def get_fake_username(fake):
-    possible_usernames = [
-        fake.first_name(),
-        fake.last_name(),
-        fake.name().replace(" ", ""),
-        fake.user_name(),
-        get_random_string(random.randint(4, 8)),
-    ]
-
-    return random.choice(possible_usernames)