mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-12-08 19:35:14 -05:00
fix: Lint Python code with ruff (#3799)
This commit is contained in:
@@ -40,7 +40,7 @@ def test_get_all_users_admin(
|
||||
assert response.status_code == 200
|
||||
|
||||
# assert all users from all groups are returned
|
||||
response_user_ids = set(user["id"] for user in response.json()["items"])
|
||||
response_user_ids = {user["id"] for user in response.json()["items"]}
|
||||
for user_id in user_ids:
|
||||
assert user_id in response_user_ids
|
||||
|
||||
@@ -73,7 +73,7 @@ def test_get_all_group_users(
|
||||
|
||||
user_group = database.groups.get_by_slug_or_id(user.group_id)
|
||||
assert user_group
|
||||
same_group_user_ids: set[str] = set([str(user.user_id)])
|
||||
same_group_user_ids: set[str] = {user.user_id}
|
||||
for _ in range(random_int(2, 5)):
|
||||
new_user = database.users.create(
|
||||
{
|
||||
@@ -89,7 +89,7 @@ def test_get_all_group_users(
|
||||
|
||||
response = api_client.get(api_routes.users_group_users, params={"perPage": -1}, headers=user.token)
|
||||
assert response.status_code == 200
|
||||
response_user_ids = set(user["id"] for user in response.json()["items"])
|
||||
response_user_ids = {user["id"] for user in response.json()["items"]}
|
||||
|
||||
# assert only users from the same group are returned
|
||||
for user_id in other_group_user_ids:
|
||||
|
||||
@@ -234,7 +234,10 @@ def test_ldap_user_login_simple_filter(api_client: TestClient):
|
||||
@pytest.mark.skipif(not os.environ.get("GITHUB_ACTIONS", False), reason="requires ldap service in github actions")
|
||||
def test_ldap_user_login_complex_filter(api_client: TestClient):
|
||||
settings = get_app_settings()
|
||||
settings.LDAP_USER_FILTER = "(&(objectClass=inetOrgPerson)(|(memberOf=cn=ship_crew,ou=people,dc=planetexpress,dc=com)(memberOf=cn=admin_staff,ou=people,dc=planetexpress,dc=com)))"
|
||||
settings.LDAP_USER_FILTER = (
|
||||
"(&(objectClass=inetOrgPerson)(|(memberOf=cn=ship_crew,ou=people,dc=planetexpress,dc=com)"
|
||||
"(memberOf=cn=admin_staff,ou=people,dc=planetexpress,dc=com)))"
|
||||
)
|
||||
|
||||
form_data = {"username": "professor", "password": "professor"}
|
||||
response = api_client.post(api_routes.auth_token, data=form_data)
|
||||
|
||||
@@ -3,14 +3,11 @@ import json
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from mealie.core.config import get_app_settings
|
||||
from mealie.db.db_setup import session_context
|
||||
from mealie.repos.repository_factory import AllRepositories
|
||||
from mealie.schema.response.pagination import PaginationQuery
|
||||
from mealie.schema.user.user import ChangePassword, PrivateUser
|
||||
from mealie.schema.user.user import PrivateUser
|
||||
from mealie.services.user_services.password_reset_service import PasswordResetService
|
||||
from tests.utils import api_routes
|
||||
from tests.utils.factories import random_email, random_string
|
||||
from tests.utils.factories import random_string
|
||||
from tests.utils.fixture_schemas import TestUser
|
||||
|
||||
|
||||
@@ -27,7 +24,7 @@ def test_password_reset(api_client: TestClient, unique_user: TestUser, casing: s
|
||||
cased_email += letter.upper()
|
||||
else:
|
||||
cased_email += letter.lower()
|
||||
cased_email
|
||||
assert cased_email
|
||||
|
||||
with session_context() as session:
|
||||
service = PasswordResetService(session)
|
||||
@@ -75,7 +72,7 @@ def test_password_reset_ldap(ldap_user: PrivateUser, casing: str):
|
||||
cased_email += letter.upper()
|
||||
else:
|
||||
cased_email += letter.lower()
|
||||
cased_email
|
||||
assert cased_email
|
||||
|
||||
with session_context() as session:
|
||||
service = PasswordResetService(session)
|
||||
|
||||
Reference in New Issue
Block a user