Migrate remaining tests to pytest

Author: apragacz

pyproject.toml

@@ -75,6 +75,7 @@ exclude = [
 ]
 
 [tool.isort]
+profile = "black"
 line_length = 88
 skip = ["migrations", "examples", ".venv", ".tox"]
 known_third_party = "django_dynamic_fixture"

requirements/requirements-ci.in

@@ -4,6 +4,7 @@ flake8-comprehensions
 flake8-debugger
 flake8-isort
 flake8-pyproject
+flake8-pytest-style
 flake8-print
 flake8-tuple
 isort[pyproject]

requirements/requirements-ci.lock.txt

@@ -118,10 +118,14 @@ flake8-debugger==4.1.2
     # via -r requirements/requirements-ci.in
 flake8-isort==6.1.1
     # via -r requirements/requirements-ci.in
+flake8-plugin-utils==1.3.3
+    # via flake8-pytest-style
 flake8-print==5.0.0
     # via -r requirements/requirements-ci.in
 flake8-pyproject==1.2.3
     # via -r requirements/requirements-ci.in
+flake8-pytest-style==2.0.0
+    # via -r requirements/requirements-ci.in
 flake8-tuple==0.4.1
     # via -r requirements/requirements-ci.in
 h11==0.14.0

requirements/requirements-dev.lock.txt

@@ -151,10 +151,16 @@ flake8-debugger==4.1.2
     # via -r requirements/requirements-ci.lock.txt
 flake8-isort==6.1.1
     # via -r requirements/requirements-ci.lock.txt
+flake8-plugin-utils==1.3.3
+    # via
+    #   -r requirements/requirements-ci.lock.txt
+    #   flake8-pytest-style
 flake8-print==5.0.0
     # via -r requirements/requirements-ci.lock.txt
 flake8-pyproject==1.2.3
     # via -r requirements/requirements-ci.lock.txt
+flake8-pytest-style==2.0.0
+    # via -r requirements/requirements-ci.lock.txt
 flake8-tuple==0.4.1
     # via -r requirements/requirements-ci.lock.txt
 h11==0.14.0

rest_registration/api/serializers.py

@@ -6,7 +6,7 @@
 from rest_registration.utils.validation import (
     run_validators,
     validate_user_password,
-    validate_user_password_confirm
+    validate_user_password_confirm,
 )
 
 

rest_registration/api/urls.py

@@ -10,7 +10,7 @@
     reset_password,
     send_reset_password_link,
     verify_email,
-    verify_registration
+    verify_registration,
 )
 
 app_name = 'rest_registration'

rest_registration/api/views/register.py

@@ -18,7 +18,7 @@
 from rest_registration.utils.users import (
     get_user_by_verification_id,
     get_user_email_field_name,
-    get_user_setting
+    get_user_setting,
 )
 from rest_registration.utils.verification import verify_signer_or_bad_request
 

rest_registration/api/views/register_email.py

@@ -17,7 +17,7 @@
     get_user_by_verification_id,
     get_user_email_field_name,
     is_user_email_field_unique,
-    user_with_email_exists
+    user_with_email_exists,
 )
 from rest_registration.utils.verification import verify_signer_or_bad_request
 

rest_registration/api/views/reset_password.py

@@ -17,7 +17,7 @@
 from rest_registration.utils.validation import (
     run_validators,
     validate_password_with_user_id,
-    validate_user_password_confirm
+    validate_user_password_confirm,
 )
 from rest_registration.utils.verification import verify_signer_or_bad_request
 

rest_registration/auth_token_managers.py

@@ -65,17 +65,19 @@ def get_app_names(self) -> Sequence[str]:
         ]
 
     def provide_token(self, user: 'AbstractBaseUser') -> AuthToken:
-        from rest_framework.authtoken.models import \
-            Token  # noqa: E501 pylint: disable=import-outside-toplevel
+        from rest_framework.authtoken.models import (  # noqa: E501 pylint: disable=import-outside-toplevel
+            Token,
+        )
 
         token_obj, _ = Token.objects.get_or_create(user=user)
         return AuthToken(token_obj.key)
 
     def revoke_token(
             self, user: 'AbstractBaseUser', *,
             token: Optional[AuthToken] = None) -> None:
-        from rest_framework.authtoken.models import \
-            Token  # noqa: E501 pylint: disable=import-outside-toplevel
+        from rest_framework.authtoken.models import (  # noqa: E501 pylint: disable=import-outside-toplevel
+            Token,
+        )
 
         try:
             token_obj: Token = Token.objects.get(user_id=user.pk)

rest_registration/checks.py

@@ -17,7 +17,7 @@
     get_user_email_field_name,
     get_user_login_field_names,
     get_user_setting,
-    is_model_field_unique
+    is_model_field_unique,
 )
 
 if TYPE_CHECKING:

rest_registration/contrib/verification_redirects/views.py

@@ -6,7 +6,7 @@
 from rest_registration.api.views.register_email import process_verify_email_data
 from rest_registration.api.views.reset_password import process_reset_password_data
 from rest_registration.contrib.verification_redirects.settings import (
-    verification_redirects_settings
+    verification_redirects_settings,
 )
 
 

rest_registration/enums.py

@@ -9,8 +9,9 @@
 class _BaseCheckCodeMixin(CheckCode):  # noqa: E501 pylint: disable=abstract-method
 
     def get_app_name(self) -> str:
-        from rest_registration.apps import \
-            RestRegistrationConfig  # noqa: E501 pylint: disable=import-outside-toplevel, cyclic-import
+        from rest_registration.apps import (  # noqa: E501 pylint: disable=import-outside-toplevel, cyclic-import
+            RestRegistrationConfig,
+        )
 
         return RestRegistrationConfig.name
 

rest_registration/notifications/__init__.py

@@ -1,5 +1,5 @@
 from .email import (  # noqa: F401
     create_verification_notification,
     send_notification,
-    send_verification_notification
+    send_verification_notification,
 )

rest_registration/utils/html.py

@@ -14,6 +14,10 @@ def convert_html_to_text(value: str, preserve_urls: bool = False) -> str:
     return stripper.get_data()
 
 
+class MLStripperParseFailed(ValueError):
+    pass
+
+
 class MLStripper(HTMLParser):
 
     def __init__(self, preserve_urls: bool = False) -> None:
@@ -29,7 +33,7 @@ def parse_marked_section(self, i, report=1):
         except AssertionError as exc:
             # rephrase confusing assertion error introduced by:
             # https://bugs.python.org/issue38573
-            raise ValueError(str(exc)) from exc
+            raise MLStripperParseFailed(str(exc)) from exc
 
     def handle_starttag(self, tag: str, attrs: List[Tuple[str, Optional[str]]]) -> None:
         self._tag_info_stack.append(TagInfo(tag, dict(attrs)))
@@ -58,7 +62,7 @@ def handle_data(self, data: str) -> None:
             self._append_segment(data)
 
     def error(self, message: str) -> None:
-        raise ValueError(f"HTML parse error: {message}")
+        raise MLStripperParseFailed(f"HTML parse error: {message}")
 
     def get_data(self) -> str:
         paragraph_texts = []

rest_registration/utils/types.py

@@ -2,6 +2,7 @@
 
 if TYPE_CHECKING:
     from django_stubs_ext import StrOrPromise
+
     # mypy uses typing_extensions by default (Py 3.8); when importing from typing
     # one will get the following error message in mypy:
     #

rest_registration/utils/users.py

@@ -7,7 +7,7 @@
     List,
     Tuple,
     TypeVar,
-    Union
+    Union,
 )
 
 from django.contrib import auth

rest_registration/utils/validation.py

@@ -12,7 +12,7 @@
 from rest_registration.utils.users import (
     UserAttrsProxy,
     build_initial_user,
-    get_user_by_verification_id
+    get_user_by_verification_id,
 )
 
 if TYPE_CHECKING:

tests/helpers/testcases.py

@@ -3,7 +3,7 @@
 from rest_registration.settings import registration_settings
 
 
-@pytest.fixture()
+@pytest.fixture
 def serializer():
     serializer_class = registration_settings.REGISTER_SERIALIZER_CLASS
     return serializer_class(data={})
@@ -12,25 +12,35 @@ def serializer():
 def test_generated_fields(settings_with_register_verification, serializer):
     field_names = set(serializer.get_fields())
     assert field_names == {
-        'id', 'username', 'first_name', 'last_name', 'email',
-        'password', 'password_confirm',
+        "id",
+        "username",
+        "first_name",
+        "last_name",
+        "email",
+        "password",
+        "password_confirm",
     }
 
 
 def test_simple_email_based_user_generated_fields(
-        settings_with_register_verification,
-        settings_with_simple_email_based_user,
-        serializer):
+    settings_with_register_verification,
+    settings_with_simple_email_based_user,
+    serializer,
+):
     field_names = set(serializer.get_fields())
 
-    assert field_names == {'id', 'email', 'password', 'password_confirm'}
+    assert field_names == {"id", "email", "password", "password_confirm"}
 
 
 def test_no_password_generated_fields(
-        settings_with_register_verification,
-        settings_with_register_no_confirm,
-        serializer):
+    settings_with_register_verification, settings_with_register_no_confirm, serializer
+):
     field_names = set(serializer.get_fields())
     assert field_names == {
-        'id', 'username', 'first_name', 'last_name', 'email', 'password',
+        "id",
+        "username",
+        "first_name",
+        "last_name",
+        "email",
+        "password",
     }