tests: Small coverage related improvements

allauth/account/adapter.py

@@ -10,6 +10,7 @@
 from django.contrib.auth import (
     authenticate,
     get_backends,
+    get_user_model,
     login as django_login,
     logout as django_logout,
 )
@@ -35,7 +36,6 @@
 from allauth.utils import (
     build_absolute_uri,
     generate_unique_username,
-    get_user_model,
     import_attribute,
 )
 

allauth/account/app_settings.py

@@ -351,9 +351,10 @@ def PRESERVE_USERNAME_CASING(self):
 
     @property
     def USERNAME_VALIDATORS(self):
+        from django.contrib.auth import get_user_model
         from django.core.exceptions import ImproperlyConfigured
 
-        from allauth.utils import get_user_model, import_attribute
+        from allauth.utils import import_attribute
 
         path = self._setting("USERNAME_VALIDATORS", None)
         if path:

allauth/account/auth_backends.py

@@ -1,8 +1,8 @@
 from threading import local
 
+from django.contrib.auth import get_user_model
 from django.contrib.auth.backends import ModelBackend
 
-from ..utils import get_user_model
 from . import app_settings
 from .app_settings import AuthenticationMethod
 from .utils import filter_users_by_email, filter_users_by_username

allauth/account/management/commands/account_unsetmultipleprimaryemails.py

@@ -1,9 +1,9 @@
+from django.contrib.auth import get_user_model
 from django.core.management.base import BaseCommand
 from django.db.models import Count
 
 from allauth.account.models import EmailAddress
 from allauth.account.utils import user_email
-from allauth.utils import get_user_model
 
 
 class Command(BaseCommand):

allauth/account/tests/test_adapter.py

@@ -5,13 +5,15 @@
 from allauth.core.exceptions import ImmediateHttpResponse
 
 
-class TestAccountAdapter(DefaultAccountAdapter):
+class PreLoginRedirectAccountAdapter(DefaultAccountAdapter):
     def pre_login(self, *args, **kwargs):
         raise ImmediateHttpResponse(HttpResponseRedirect("/foo"))
 
 
 def test_adapter_pre_login(settings, user, user_password, client):
-    settings.ACCOUNT_ADAPTER = "allauth.account.tests.test_adapter.TestAccountAdapter"
+    settings.ACCOUNT_ADAPTER = (
+        "allauth.account.tests.test_adapter.PreLoginRedirectAccountAdapter"
+    )
     resp = client.post(
         reverse("account_login"),
         {"login": user.username, "password": user_password},

allauth/account/tests/test_ajax.py

@@ -3,13 +3,13 @@
 import json
 
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.core import mail
 from django.test.utils import override_settings
 from django.urls import reverse
 
 from allauth.account import app_settings
 from allauth.tests import TestCase
-from allauth.utils import get_user_model
 
 
 class AjaxTests(TestCase):

allauth/account/tests/test_auth_backends.py

@@ -1,11 +1,11 @@
 from __future__ import absolute_import
 
+from django.contrib.auth import get_user_model
 from django.test.utils import override_settings
 
 from allauth.account import app_settings
 from allauth.account.auth_backends import AuthenticationBackend
 from allauth.tests import TestCase
-from allauth.utils import get_user_model
 
 
 class AuthenticationBackendTests(TestCase):

allauth/account/tests/test_change_email.py

@@ -3,6 +3,7 @@
 import json
 from unittest.mock import patch
 
+from django.contrib.auth import get_user_model
 from django.test.utils import override_settings
 from django.urls import reverse
 
@@ -12,7 +13,6 @@
 from allauth.account.models import EmailAddress, EmailConfirmationHMAC
 from allauth.account.utils import user_email
 from allauth.tests import TestCase
-from allauth.utils import get_user_model
 
 
 class ChangeEmailTests(TestCase):

allauth/account/tests/test_commands.py

@@ -0,0 +1,7 @@
+from django.core.management import call_command
+
+
+def test_unset_multipleprimaryemails(db):
+    # This command needs to be dropped, in favor of having a conditional
+    # constraint.
+    call_command("account_unsetmultipleprimaryemails")

allauth/account/tests/test_confirm_email.py

@@ -3,6 +3,7 @@
 from datetime import timedelta
 
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.core import mail
 from django.http import HttpResponseRedirect
 from django.test.client import Client, RequestFactory
@@ -19,7 +20,6 @@
 from allauth.account.signals import user_logged_in
 from allauth.account.utils import user_pk_to_url_str
 from allauth.tests import Mock, TestCase, patch
-from allauth.utils import get_user_model
 
 from .test_models import UUIDUser
 

allauth/account/tests/test_login.py

@@ -4,14 +4,14 @@
 
 import django
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.core import mail
 from django.test.utils import override_settings
 from django.urls import reverse
 
 from allauth.account import app_settings
 from allauth.account.models import EmailAddress
 from allauth.tests import TestCase
-from allauth.utils import get_user_model
 
 
 @override_settings(

allauth/account/tests/test_logout.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+from django.contrib.auth import get_user_model
 from django.core import validators
 from django.test.client import Client
 from django.test.utils import override_settings
@@ -8,7 +9,6 @@
 from allauth.account import app_settings
 from allauth.account.signals import user_logged_out
 from allauth.tests import Mock, TestCase
-from allauth.utils import get_user_model
 
 
 test_username_validators = [

allauth/account/tests/test_models.py

@@ -3,9 +3,25 @@
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 
+from allauth.account.models import EmailAddress
+
 
 class UUIDUser(AbstractUser):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
 
     class Meta(AbstractUser.Meta):
         swappable = "AUTH_USER_MODEL"
+
+
+def test_add_new_email(rf, user, settings):
+    settings.ACCOUNT_CHANGE_EMAIL = True
+    request = rf.get("/")
+    assert EmailAddress.objects.filter(user=user).count() == 1
+    new_email = EmailAddress.objects.add_new_email(request, user, "[email protected]")
+    assert not new_email.verified
+    assert not new_email.primary
+    assert EmailAddress.objects.filter(user=user).count() == 2
+    EmailAddress.objects.add_new_email(request, user, "[email protected]")
+    assert EmailAddress.objects.filter(user=user).count() == 2
+    new_email.refresh_from_db()
+    assert new_email.email == "[email protected]"

allauth/account/tests/test_ratelimit.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import
 
+from django.contrib.auth import get_user_model
 from django.test.utils import override_settings
 from django.urls import reverse
 
 from allauth.tests import TestCase
-from allauth.utils import get_user_model
 
 
 @override_settings(

allauth/account/tests/test_reset_password.py

@@ -2,6 +2,7 @@
 
 import json
 
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
 from django.core import mail
 from django.test.utils import override_settings
@@ -11,7 +12,6 @@
 from allauth.account.forms import ResetPasswordForm
 from allauth.account.models import EmailAddress
 from allauth.tests import TestCase
-from allauth.utils import get_user_model
 
 
 @override_settings(

allauth/account/tests/test_security.py

@@ -1,12 +1,12 @@
 from __future__ import absolute_import
 
+from django.contrib.auth import get_user_model
 from django.core import mail
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
 
 from allauth.account.forms import ResetPasswordForm
 from allauth.tests import TestCase
-from allauth.utils import get_user_model
 
 
 @override_settings(ACCOUNT_PREVENT_ENUMERATION=False)

allauth/account/tests/test_signup.py

@@ -2,6 +2,7 @@
 
 import django
 from django import forms
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.messages.middleware import MessageMiddleware
 from django.contrib.sessions.middleware import SessionMiddleware
@@ -19,7 +20,7 @@
 from allauth.account.models import EmailAddress
 from allauth.core import context
 from allauth.tests import TestCase
-from allauth.utils import get_user_model, get_username_max_length
+from allauth.utils import get_username_max_length
 
 
 class CustomSignupFormTests(TestCase):

allauth/account/tests/test_utils.py

@@ -3,6 +3,7 @@
 import uuid
 
 from django.contrib import messages
+from django.contrib.auth import get_user_model
 from django.contrib.messages.api import get_messages
 from django.contrib.messages.middleware import MessageMiddleware
 from django.contrib.sessions.middleware import SessionMiddleware
@@ -23,7 +24,6 @@
 )
 from allauth.core import context
 from allauth.tests import TestCase, patch
-from allauth.utils import get_user_model
 
 from .test_models import UUIDUser
 

allauth/mfa/migrations/0001_initial.py

@@ -1,8 +1,8 @@
 # Generated by Django 3.2.20 on 2023-08-19 14:43
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

allauth/socialaccount/helpers.py

@@ -225,14 +225,6 @@ def complete_social_signup(request, sociallogin):
     )
 
 
-# TODO: Factor out callable importing functionality
-# See: account.utils.user_display
-def import_path(path):
-    modname, _, attr = path.rpartition(".")
-    m = __import__(modname, fromlist=[attr])
-    return getattr(m, attr)
-
-
 def socialaccount_user_display(socialaccount):
     func = app_settings.SOCIALACCOUNT_STR
     if not func:

allauth/socialaccount/migrations/0005_socialtoken_nullable_app.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.2.20 on 2023-09-03 19:46
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

allauth/socialaccount/models.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from django.contrib.auth import authenticate
+from django.contrib.auth import authenticate, get_user_model
 from django.contrib.sites.shortcuts import get_current_site
 from django.core.exceptions import PermissionDenied
 from django.db import models
@@ -12,7 +12,6 @@
 from allauth.account.utils import get_next_redirect_url, setup_user_email
 from allauth.core import context
 from allauth.socialaccount import signals
-from allauth.utils import get_user_model
 
 from ..utils import get_request_param
 from . import app_settings, providers

setup.cfg

@@ -77,3 +77,8 @@ sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 max-line-length = 88
 # Black
 ignore = E203, W503, E501, E231
+
+
+[coverage:run]
+omit =
+    **/test*.py