API - refacto + remove unused endpoint for now

This commit is contained in:
Sam
2022-03-19 20:34:36 +01:00
parent dfe50b5287
commit b5b4ac8f92
19 changed files with 499 additions and 577 deletions

File diff suppressed because it is too large Load Diff

View File

@ -6,11 +6,10 @@ from unittest.mock import MagicMock, patch
from flask import Flask
from fittrackee.users.models import User, UserSportPreference
from fittrackee.users.utils.random import random_string
from fittrackee.utils import get_readable_duration
from fittrackee.workouts.models import Sport, Workout
from ..api_test_case import ApiTestCaseMixin
from ..mixins import ApiTestCaseMixin
class TestGetUser(ApiTestCaseMixin):
@ -1108,7 +1107,7 @@ class TestUpdateUser(ApiTestCaseMixin):
response = client.patch(
f'/api/users/{user_2.username}',
content_type='application/json',
data=json.dumps(dict(new_email=random_string())),
data=json.dumps(dict(new_email=self.random_string())),
headers=dict(Authorization=f'Bearer {auth_token}'),
)
@ -1128,7 +1127,7 @@ class TestUpdateUser(ApiTestCaseMixin):
client.patch(
f'/api/users/{user_2.username}',
content_type='application/json',
data=json.dumps(dict(new_email=random_string())),
data=json.dumps(dict(new_email=self.random_string())),
headers=dict(Authorization=f'Bearer {auth_token}'),
)
@ -1166,7 +1165,7 @@ class TestUpdateUser(ApiTestCaseMixin):
app, user_1_admin.email
)
new_email = 'new.' + user_2.email
expected_token = random_string()
expected_token = self.random_string()
with patch('secrets.token_urlsafe', return_value=expected_token):
response = client.patch(

View File

@ -3,6 +3,7 @@ from unittest.mock import patch
import pytest
from flask import Flask
from fittrackee.tests.utils import random_string
from fittrackee.users.exceptions import UserNotFoundException
from fittrackee.users.models import User
from fittrackee.users.utils.admin import set_admin_rights
@ -12,7 +13,6 @@ from fittrackee.users.utils.controls import (
is_valid_email,
register_controls,
)
from fittrackee.users.utils.random import random_string
class TestSetAdminRights: