diff --git a/backend/Dockerfile b/backend/Dockerfile index 44c53f0365..fc672e525f 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -34,6 +34,7 @@ COPY ./scripts /app/scripts COPY ./pyproject.toml ./uv.lock ./alembic.ini /app/ COPY ./app /app/app +COPY ./tests /app/tests # Sync the project # Ref: https://docs.astral.sh/uv/guides/integration/docker/#intermediate-layers diff --git a/backend/README.md b/backend/README.md index 17210a2f2c..c217000fc2 100644 --- a/backend/README.md +++ b/backend/README.md @@ -97,7 +97,7 @@ To test the backend run: $ bash ./scripts/test.sh ``` -The tests run with Pytest, modify and add tests to `./backend/app/tests/`. +The tests run with Pytest, modify and add tests to `./backend/tests/`. If you use GitHub Actions the tests will run automatically. diff --git a/backend/scripts/test.sh b/backend/scripts/test.sh index bd063f72cf..38c3e8909a 100755 --- a/backend/scripts/test.sh +++ b/backend/scripts/test.sh @@ -3,6 +3,6 @@ set -e set -x -coverage run -m pytest +coverage run -m pytest tests/ coverage report coverage html --title "${@-coverage}" diff --git a/backend/app/tests/__init__.py b/backend/tests/__init__.py similarity index 100% rename from backend/app/tests/__init__.py rename to backend/tests/__init__.py diff --git a/backend/app/tests/api/__init__.py b/backend/tests/api/__init__.py similarity index 100% rename from backend/app/tests/api/__init__.py rename to backend/tests/api/__init__.py diff --git a/backend/app/tests/api/routes/__init__.py b/backend/tests/api/routes/__init__.py similarity index 100% rename from backend/app/tests/api/routes/__init__.py rename to backend/tests/api/routes/__init__.py diff --git a/backend/app/tests/api/routes/test_items.py b/backend/tests/api/routes/test_items.py similarity index 98% rename from backend/app/tests/api/routes/test_items.py rename to backend/tests/api/routes/test_items.py index c215238a69..db950b4535 100644 --- a/backend/app/tests/api/routes/test_items.py +++ b/backend/tests/api/routes/test_items.py @@ -4,7 +4,7 @@ from sqlmodel import Session from app.core.config import settings -from app.tests.utils.item import create_random_item +from tests.utils.item import create_random_item def test_create_item( diff --git a/backend/app/tests/api/routes/test_login.py b/backend/tests/api/routes/test_login.py similarity index 96% rename from backend/app/tests/api/routes/test_login.py rename to backend/tests/api/routes/test_login.py index 80fa787979..ee166913bd 100644 --- a/backend/app/tests/api/routes/test_login.py +++ b/backend/tests/api/routes/test_login.py @@ -7,9 +7,9 @@ from app.core.security import verify_password from app.crud import create_user from app.models import UserCreate -from app.tests.utils.user import user_authentication_headers -from app.tests.utils.utils import random_email, random_lower_string from app.utils import generate_password_reset_token +from tests.utils.user import user_authentication_headers +from tests.utils.utils import random_email, random_lower_string def test_get_access_token(client: TestClient) -> None: diff --git a/backend/app/tests/api/routes/test_private.py b/backend/tests/api/routes/test_private.py similarity index 100% rename from backend/app/tests/api/routes/test_private.py rename to backend/tests/api/routes/test_private.py diff --git a/backend/app/tests/api/routes/test_users.py b/backend/tests/api/routes/test_users.py similarity index 99% rename from backend/app/tests/api/routes/test_users.py rename to backend/tests/api/routes/test_users.py index ba9be65426..39e053e554 100644 --- a/backend/app/tests/api/routes/test_users.py +++ b/backend/tests/api/routes/test_users.py @@ -8,7 +8,7 @@ from app.core.config import settings from app.core.security import verify_password from app.models import User, UserCreate -from app.tests.utils.utils import random_email, random_lower_string +from tests.utils.utils import random_email, random_lower_string def test_get_users_superuser_me( diff --git a/backend/app/tests/conftest.py b/backend/tests/conftest.py similarity index 89% rename from backend/app/tests/conftest.py rename to backend/tests/conftest.py index 90ab39a357..8ddab7b321 100644 --- a/backend/app/tests/conftest.py +++ b/backend/tests/conftest.py @@ -8,8 +8,8 @@ from app.core.db import engine, init_db from app.main import app from app.models import Item, User -from app.tests.utils.user import authentication_token_from_email -from app.tests.utils.utils import get_superuser_token_headers +from tests.utils.user import authentication_token_from_email +from tests.utils.utils import get_superuser_token_headers @pytest.fixture(scope="session", autouse=True) diff --git a/backend/app/tests/crud/__init__.py b/backend/tests/crud/__init__.py similarity index 100% rename from backend/app/tests/crud/__init__.py rename to backend/tests/crud/__init__.py diff --git a/backend/app/tests/crud/test_user.py b/backend/tests/crud/test_user.py similarity index 97% rename from backend/app/tests/crud/test_user.py rename to backend/tests/crud/test_user.py index e9eb4a0391..10bda25e25 100644 --- a/backend/app/tests/crud/test_user.py +++ b/backend/tests/crud/test_user.py @@ -4,7 +4,7 @@ from app import crud from app.core.security import verify_password from app.models import User, UserCreate, UserUpdate -from app.tests.utils.utils import random_email, random_lower_string +from tests.utils.utils import random_email, random_lower_string def test_create_user(db: Session) -> None: diff --git a/backend/app/tests/scripts/__init__.py b/backend/tests/scripts/__init__.py similarity index 100% rename from backend/app/tests/scripts/__init__.py rename to backend/tests/scripts/__init__.py diff --git a/backend/app/tests/scripts/test_backend_pre_start.py b/backend/tests/scripts/test_backend_pre_start.py similarity index 100% rename from backend/app/tests/scripts/test_backend_pre_start.py rename to backend/tests/scripts/test_backend_pre_start.py diff --git a/backend/app/tests/scripts/test_test_pre_start.py b/backend/tests/scripts/test_test_pre_start.py similarity index 100% rename from backend/app/tests/scripts/test_test_pre_start.py rename to backend/tests/scripts/test_test_pre_start.py diff --git a/backend/app/tests/utils/__init__.py b/backend/tests/utils/__init__.py similarity index 100% rename from backend/app/tests/utils/__init__.py rename to backend/tests/utils/__init__.py diff --git a/backend/app/tests/utils/item.py b/backend/tests/utils/item.py similarity index 80% rename from backend/app/tests/utils/item.py rename to backend/tests/utils/item.py index 6e32b3a84a..ee51b351a6 100644 --- a/backend/app/tests/utils/item.py +++ b/backend/tests/utils/item.py @@ -2,8 +2,8 @@ from app import crud from app.models import Item, ItemCreate -from app.tests.utils.user import create_random_user -from app.tests.utils.utils import random_lower_string +from tests.utils.user import create_random_user +from tests.utils.utils import random_lower_string def create_random_item(db: Session) -> Item: diff --git a/backend/app/tests/utils/user.py b/backend/tests/utils/user.py similarity index 95% rename from backend/app/tests/utils/user.py rename to backend/tests/utils/user.py index 9c1b073109..5867431ed8 100644 --- a/backend/app/tests/utils/user.py +++ b/backend/tests/utils/user.py @@ -4,7 +4,7 @@ from app import crud from app.core.config import settings from app.models import User, UserCreate, UserUpdate -from app.tests.utils.utils import random_email, random_lower_string +from tests.utils.utils import random_email, random_lower_string def user_authentication_headers( diff --git a/backend/app/tests/utils/utils.py b/backend/tests/utils/utils.py similarity index 100% rename from backend/app/tests/utils/utils.py rename to backend/tests/utils/utils.py