refactoring with app_factory

src/tests/conftest.py

@@ -1,34 +1,38 @@
 import os
+from fastapi.testclient import TestClient
 import pytest
 from unittest.mock import patch
 from shared.settings import Settings
 
+
 @pytest.fixture(autouse=True)
 def mock_logger_add():
     """Fixture to mock loguru.logger.add for all tests."""
     with patch('loguru.logger.add') as mock_add:
         yield mock_add  # This makes the mock available to tests
 
-# @pytest.fixture(autouse=True)
-# def settings():
-#     return Settings(_env_file=".env.test")
+
+@pytest.fixture()
+def settings():
+    return Settings(_env_file=".env.test")
 
 
 @pytest.fixture(autouse=True)
-def settings():
+def mock_settings():
     with patch('shared.settings.Settings', return_value=Settings(_env_file=".env.test")) as mock_settings:
         yield mock_settings
 
 
 @pytest.fixture()
-def test_db(settings):
-    from db.database import make_engine, make_session_local
+def test_db(settings: Settings):
+    from db.database import make_engine
     from db import models
 
     engine = make_engine(settings.DATABASE_PATH)
 
-    if not os.path.exists(settings.DATABASE_PATH):
-        open(settings.DATABASE_PATH, 'w').close()
+    fs = settings.DATABASE_PATH.replace("sqlite:///", "")
+    if not os.path.exists(fs):
+        open(fs, 'w').close()
 
     models.Base.metadata.create_all(engine)
 
@@ -37,13 +41,35 @@ def test_db(settings):
     connection.close()
 
     models.Base.metadata.drop_all(bind=engine)
-    os.remove(settings.DATABASE_PATH)
+    for suffix in ["", "-wal", "-shm"]:
+        new_fs = fs + suffix
+        if os.path.exists(new_fs): 
+            os.remove(new_fs)
 
-# @pytest.fixture()
-# def db_session(test_db):
-#     session_local = make_session_local(test_db)
-#     with session_local() as session:
-#         yield session
+
+@pytest.fixture()
+def db_session(test_db):
+    from db.database import make_session_local
+    session_local = make_session_local(test_db)
+    with session_local() as session:
+        yield session
+
+
+@pytest.fixture()
+def app(db_session, settings):
+    from web.main import app_factory
+    app = app_factory()
+    from security import get_token_or_user_auth
+    app.dependency_overrides[get_token_or_user_auth] = lambda: "example@email.com"
+    # app.dependency_overrides[settings] = lambda: settings
+    # app.dependency_overrides[get_session] = lambda: db_session
+    return app
+
+
+@pytest.fixture()
+def client(app):
+    client = TestClient(app)
+    return client
 
 # # create test data and insert it into the database
 # def create_test_data():
@@ -57,4 +83,4 @@ def test_db(settings):
 #     db.refresh(task)
 #     db.close()
 
-#     return task.id
+#     return task.id