run linter on old files

src/app/settings.py

@@ -29,7 +29,7 @@
     "django.contrib.staticfiles",
     "users",
     "rest_framework",
-    "rest_framework.authtoken", # to avoid AttributeError: type object 'Token' has no attribute 'objects'
+    "rest_framework.authtoken",  # to avoid AttributeError: type object 'Token' has no attribute 'objects'
     "drf_spectacular",  # docs
     "djoser",
 ]

tests/api/users/test_activate.py

@@ -1,29 +1,35 @@
+import djoser.constants
+import djoser.utils
 import pytest
 from django.contrib.auth.tokens import default_token_generator
-import djoser.utils
-import djoser.constants
 
 
 def test__activates_user(client, user_factory):
     user = user_factory(is_active=False)
     assert user.is_active == False
     payload = {
         "uid": djoser.utils.encode_uid(user.pk),
-        "token": default_token_generator.make_token(user)
+        "token": default_token_generator.make_token(user),
     }
     r = client.post("/users/activation/", data=payload)
     assert r.status_code == 204
     user.refresh_from_db()
     assert user.is_active
 
 
-@pytest.mark.parametrize("field, err_msg", [("uid", djoser.constants.Messages.INVALID_UID_ERROR), ("token",djoser.constants.Messages.INVALID_TOKEN_ERROR)])
+@pytest.mark.parametrize(
+    "field, err_msg",
+    [
+        ("uid", djoser.constants.Messages.INVALID_UID_ERROR),
+        ("token", djoser.constants.Messages.INVALID_TOKEN_ERROR),
+    ],
+)
 def test__with_invalid_uid_or_token__returns_400(field, err_msg, client, user_factory):
     user = user_factory(is_active=False)
     assert user.is_active == False
     payload = {
         "uid": djoser.utils.encode_uid(user.pk),
-        "token": default_token_generator.make_token(user)
+        "token": default_token_generator.make_token(user),
     }
     payload[field] = "invalid_value"
     r = client.post("/users/activation/", data=payload)

tests/api/users/test_delete.py

@@ -8,27 +8,30 @@
 
 
 def test__with_auth_user__deletes_user(client, user_factory):
-    pwd = 'test'
+    pwd = "test"
     user = user_factory(password=pwd)
     client.force_authenticate(user)
     r = client.delete(f"/users/{user.id}/", data={"current_password": pwd})
     assert r.status_code == 204
     with pytest.raises(User.DoesNotExist):
         assert user.refresh_from_db()
 
+
 def test__with_diff_user__returns_403(client, user, user_factory):
-    pwd = 'test'
+    pwd = "test"
     diff_user = user_factory(password=pwd)
     client.force_authenticate(user)
     r = client.delete(f"/users/{diff_user.id}/", data={"current_password": pwd})
     assert r.status_code == 403
 
+
 def test__with_anonymous_user__returns_401(client, user_factory):
-    pwd = 'test'
+    pwd = "test"
     user = user_factory(password=pwd)
     r = client.delete(f"/users/{user.id}/", data={"current_password": pwd})
     assert r.status_code == 401
 
+
 def test__with_invalid_id__returns_404(client, user):
     client.force_authenticate(user)
     invalid_id = user.id + 1

tests/api/users/test_list.py

@@ -2,18 +2,16 @@
 # Unauthenticated - 401
 # Filters - 200
 
+
 def test__with_auth_user__returns_same_user_only(client, user, user_factory):
     [user_factory() for _ in range(5)]
     client.force_authenticate(user)
     r = client.get("/users/")
     assert r.status_code == 200
     data = r.json()
     assert len(data["results"]) == 1
-    assert data["results"][0] == {
-        "email": user.email,
-        "name": user.name,
-        "id": user.id
-    }
+    assert data["results"][0] == {"email": user.email, "name": user.name, "id": user.id}
+
 
 def test__with_auth_admin_user__returns_all_users(client, admin_user, user_factory):
     users = [user_factory() for _ in range(5)]
@@ -27,4 +25,3 @@ def test__with_auth_admin_user__returns_all_users(client, admin_user, user_facto
 def test__with_anonymous_user__returns_401(client):
     r = client.get("/users/")
     assert r.status_code == 401
-

tests/api/users/test_me.py

@@ -3,15 +3,14 @@
 
 def test__with_authenticated_user__returns_user_data(client, user):
     jwt = create_jwt_token(user)
-    headers = {
-        "Authorization": f"JWT {jwt}"
-    }
+    headers = {"Authorization": f"JWT {jwt}"}
     r = client.get("/users/me/", headers=headers)
     assert r.status_code == 200
     data = r.json()
-    assert data['email'] == user.email
-    assert data['name'] == user.name
-    assert data['id'] == user.id
+    assert data["email"] == user.email
+    assert data["name"] == user.name
+    assert data["id"] == user.id
+
 
 def test__with_anonymous_user__returns_401(client, user):
     r = client.get("/users/me/")

tests/api/users/test_register.py

@@ -2,9 +2,11 @@
 # Missing required fields - 400
 
 import pytest
-from tests.utils import faker
-from users.models import User
 from django.core import mail
+from users.models import User
+
+from tests.utils import faker
+
 
 def test__creates_user(client):
     password = faker.password()
@@ -13,7 +15,7 @@ def test__creates_user(client):
         "email": faker.email(),
         "password": password,
         "re_password": password,
-        "name": faker.name()
+        "name": faker.name(),
     }
     r = client.post("/users/", data=payload)
     assert r.status_code == 201
@@ -32,13 +34,10 @@ def test__with_missing_fields__returns_400(field, client):
         "email": faker.email(),
         "password": password,
         "re_password": password,
-        "name": faker.name()
+        "name": faker.name(),
     }
     del payload[field]
     r = client.post("/users/", data=payload)
     assert r.status_code == 400
     data = r.json()
     assert data[field] == ["This field is required."]
-
-
-

tests/api/users/test_resend_activateion_email.py

@@ -1,22 +1,22 @@
 from django.core import mail
 
+
 def test__resends_activation_email(client, user_factory):
     user = user_factory(is_active=False)
-    r = client.post("/users/resend_activation/", data={
-        "email": user.email
-    })
+    r = client.post("/users/resend_activation/", data={"email": user.email})
     assert r.status_code == 204
     assert len(mail.outbox) == 1
     assert mail.outbox[0].to == [user.email]
-    
+
 
 def test__with_invalid_email__returns_400(client):
-    r = client.post("/users/resend_activation/", data={
-        "email": "invalid_email@test.com"
-    })
+    r = client.post(
+        "/users/resend_activation/", data={"email": "invalid_email@test.com"}
+    )
     assert r.status_code == 400
     assert len(mail.outbox) == 0
 
+
 def test__with_missing_email__returns_400(client):
     r = client.post("/users/resend_activation/")
     assert r.status_code == 400

tests/api/users/test_reset_password.py

@@ -1,6 +1,8 @@
 from django.core import mail
+
 from tests.utils import faker
 
+
 def test__with_valid_email__sends_email(client, user):
     r = client.post("/users/reset_password/", data={"email": user.email})
     assert r.status_code == 204
@@ -20,4 +22,3 @@ def test__with_invalid_email__returns_400(client):
     r = client.post("/users/reset_password/", data={"email": faker.email()})
     assert r.status_code == 400
     assert len(mail.outbox) == 0
-

tests/api/users/test_reset_password_confirmation.py

@@ -1,7 +1,8 @@
+import djoser.utils
 import pytest
-from tests.utils import faker
 from django.contrib.auth.tokens import default_token_generator
-import djoser.utils
+
+from tests.utils import faker
 
 
 def test__with_valid_uid_and_token__updates_password(client, user):

tests/api/users/test_set_password.py

@@ -1,6 +1,8 @@
 import pytest
+
 from tests.utils import faker
 
+
 def test__with_authenticated_user__changes_password(client, user_factory):
     pwd = faker.password()
     new_pwd = faker.password()
@@ -10,7 +12,7 @@ def test__with_authenticated_user__changes_password(client, user_factory):
     payload = {
         "current_password": pwd,
         "new_password": new_pwd,
-        "re_new_password": new_pwd
+        "re_new_password": new_pwd,
     }
     r = client.post("/users/set_password/", data=payload)
     assert r.status_code == 204
@@ -26,7 +28,7 @@ def test__with_anonymous_user__returns_400(client, user_factory):
     payload = {
         "current_password": pwd,
         "new_password": new_pwd,
-        "re_new_password": new_pwd
+        "re_new_password": new_pwd,
     }
     r = client.post("/users/set_password/", data=payload)
     assert r.status_code == 401
@@ -43,7 +45,7 @@ def test__with_incorrect_curr_password__returns_400(client, user_factory):
     payload = {
         "current_password": "incorrect_password",
         "new_password": new_pwd,
-        "re_new_password": new_pwd
+        "re_new_password": new_pwd,
     }
     r = client.post("/users/set_password/", data=payload)
     assert r.status_code == 400
@@ -60,15 +62,17 @@ def test__with_different_re_new_password__returns_400(client, user_factory):
     payload = {
         "current_password": pwd,
         "new_password": new_pwd,
-        "re_new_password": "diff_re_new_password"
+        "re_new_password": "diff_re_new_password",
     }
     r = client.post("/users/set_password/", data=payload)
     assert r.status_code == 400
     user.refresh_from_db()
     assert user.check_password(new_pwd) == False
 
 
-@pytest.mark.parametrize("field", ["current_password", "new_password", "re_new_password"])
+@pytest.mark.parametrize(
+    "field", ["current_password", "new_password", "re_new_password"]
+)
 def test__with_missing_fields__returns_400(field, client, user_factory):
     pwd = faker.password()
     new_pwd = faker.password()
@@ -78,7 +82,7 @@ def test__with_missing_fields__returns_400(field, client, user_factory):
     payload = {
         "current_password": pwd,
         "new_password": new_pwd,
-        "re_new_password": new_pwd
+        "re_new_password": new_pwd,
     }
     del payload[field]
     r = client.post("/users/set_password/", data=payload)

tests/conftest.py

@@ -1,12 +1,12 @@
 from collections.abc import Callable
 
 import pytest
+from django.contrib.auth.hashers import make_password
 from model_bakery import baker
 from rest_framework.test import APIClient
 from users.models import User
 
 from tests.utils import create_jwt_token, faker
-from django.contrib.auth.hashers import make_password
 
 
 def pytest_collection_modifyitems(items):
@@ -26,8 +26,8 @@ def client() -> APIClient:
 @pytest.fixture
 def user_factory() -> Callable[..., User]:
     def create_user(**kwargs) -> User:
-        if 'password' in kwargs:
-            kwargs['password'] = make_password(kwargs['password'])
+        if "password" in kwargs:
+            kwargs["password"] = make_password(kwargs["password"])
         return baker.make(User, **kwargs)
 
     return create_user
@@ -37,6 +37,7 @@ def create_user(**kwargs) -> User:
 def user(user_factory: Callable[..., User]) -> User:
     return user_factory(is_active=True, is_admin=False)
 
+
 @pytest.fixture
 def admin_user(user_factory: Callable[..., User]) -> User:
     return user_factory(is_active=True, is_admin=True)