Refact: improve tests in features and services.

tests/api/test_services_api.py

@@ -1,4 +1,7 @@
 import pytest
+from faker import Faker
+
+fake = Faker()
 
 
 def test_get_all_services_without_auth(client):
@@ -17,7 +20,9 @@ def test_get_all_services(client, auth):
     assert type(response.json()) == list
 
 
-def test_create_and_delete_service(client, service_data, auth):
+def test_create_and_delete_service(client, auth):
+
+    service_data = {"name": fake.first_name(), "description": fake.text(100)}
 
     response = client.post("/services/", service_data, auth=auth)
     assert response.status_code == 201

tests/api/test_users_api.py

@@ -1,5 +1,7 @@
 import pytest
-from random import randint
+from faker import Faker
+
+fake = Faker()
 
 
 def test_users_get_all_without_auth(client):
@@ -18,7 +20,9 @@ def test_get_all_users(client, auth):
     assert type(response.json()) == list
 
 
-def test_create_and_delete_user(client, user_data, auth):
+def test_create_and_delete_user(client, auth):
+
+    user_data = {"username": fake.first_name(), "password": fake.text(10)}
 
     response = client.post("/users/", user_data, auth=auth)
     assert response.status_code == 201
@@ -37,7 +41,9 @@ def test_get_user_by_id(client, user, auth):
     assert response.json().get("username") == user.username
 
 
-def test_update_user(client, user, user_data, auth):
+def test_update_user(client, user, auth):
+
+    user_data = {"username": fake.first_name(), "password": fake.text(10)}
 
     response = client.put(f"/users/{user.id}", user_data, auth=auth)
     assert response.status_code == 200

tests/conftest.py

@@ -10,35 +10,11 @@
 fake = Faker()
 
 
-def service_fake_data():
-    """
-    Function to create a fake data for service.
-    """
-    return {"name": fake.first_name(), "description": fake.text(100)}
-
-
-def user_fake_data():
-    """
-    Function to create a fake data for user.
-    """
-    return {"username": fake.first_name(), "password": fake.text(10)}
-
-
 @pytest.fixture()
 def client():
     return TestClient(app)
 
 
-@pytest.fixture()
-def user_data():
-    return user_fake_data()
-
-
-@pytest.fixture()
-def service_data():
-    return service_fake_data()
-
-
 @pytest.fixture()
 def number():
     return randint(0, 10000)
@@ -47,7 +23,9 @@ def number():
 @pytest.fixture()
 def user():
 
-    user_data = user_fake_data()
+    fake = Faker()
+
+    user_data = {"username": fake.first_name(), "password": fake.text(10)}
 
     user = User()
     user.create(user_data)
@@ -59,7 +37,7 @@ def user():
 @pytest.fixture()
 def service():
 
-    service_data = service_fake_data()
+    service_data = {"name": fake.first_name(), "description": fake.text(100)}
     service = Service.create(**service_data, token=secrets.token_urlsafe(31))
     yield service
     service.delete()