Move tests into subfolders

Author: chriscarrollsmith

tests/__init__.py

@@ -0,0 +1,3 @@
+"""
+This file marks tests as a Python package.
+"""

tests/conftest.py

@@ -3,12 +3,10 @@
 from sqlmodel import create_engine, Session, select
 from sqlalchemy import Engine
 from fastapi.testclient import TestClient
-import os
 from dotenv import load_dotenv
-from utils.db import get_session, get_connection_url, tear_down_db, set_up_db
+from utils.db import get_connection_url, tear_down_db, set_up_db
 from utils.models import User, PasswordResetToken, EmailUpdateToken, Organization, Role, Account
 from utils.auth import get_password_hash, create_access_token, create_refresh_token
-from utils.dependencies import get_authenticated_user, get_user_with_relations
 from main import app
 
 # Load environment variables

tests/routers/__init__.py

@@ -0,0 +1,3 @@
+"""
+This file marks tests.routers as a Python package.
+""" 

tests/test_account.py renamed to tests/routers/test_account.py

@@ -8,7 +8,6 @@
 from urllib.parse import urlparse, parse_qs
 from html import unescape
 from sqlalchemy import inspect
-from starlette.responses import RedirectResponse
 
 from main import app
 from utils.models import User, PasswordResetToken, EmailUpdateToken, Account
@@ -18,7 +17,6 @@
     validate_token,
     get_password_hash
 )
-from .conftest import SetupError
 
 # --- Fixture setup ---
 

tests/test_organization.py renamed to tests/routers/test_organization.py

@@ -1,7 +1,7 @@
 # test_role.py
 
 import pytest
-from .conftest import SetupError
+from tests.conftest import SetupError
 from utils.models import Role, Permission, ValidPermissions, User
 from sqlmodel import Session, select
 

tests/test_role.py renamed to tests/routers/test_role.py

@@ -2,7 +2,6 @@
 from httpx import Response
 from sqlmodel import Session
 from unittest.mock import patch
-from typing import cast
 
 from main import app
 from utils.models import User

tests/test_user.py renamed to tests/routers/test_user.py

@@ -0,0 +1,3 @@
+"""
+This file marks tests.utils as a Python package.
+""" 

tests/utils/__init__.py

@@ -1,4 +1,4 @@
-import warnings
+
 from sqlmodel import Session, select, inspect
 from sqlalchemy import Engine
 from utils.db import (
@@ -10,8 +10,7 @@
     set_up_db,
 )
 from utils.models import Role, Permission, Organization, RolePermissionLink, ValidPermissions
-from .conftest import SetupError
-
+from tests.conftest import SetupError
 
 def test_get_connection_url():
     """Test that get_connection_url returns a valid URL object"""