diff --git a/tests/conftest.py b/tests/conftest.py index 58a06e052..3c6e18075 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,17 +1,11 @@ -from mealie.core.config import app_dirs, settings - -# ! I don't like it either! -DB_URL = app_dirs.DATA_DIR.joinpath("test.db") -DB_URL.unlink(missing_ok=True) - -settings.DB_URL = "sqlite:///" + str(DB_URL.absolute()) +from tests.pre_test import DB_URL, settings # isort:skip import json import requests from fastapi.testclient import TestClient from mealie.app import app -from mealie.db.db_setup import generate_session, sql_global_init +from mealie.db.db_setup import SessionLocal, generate_session from mealie.db.init_db import init_db from pytest import fixture @@ -19,13 +13,12 @@ from tests.app_routes import AppRoutes from tests.test_config import TEST_DATA from tests.utils.recipe_data import build_recipe_store, get_raw_no_image, get_raw_recipe -TestSessionLocal = sql_global_init(settings.DB_URL) -init_db(TestSessionLocal()) +init_db(SessionLocal()) def override_get_db(): try: - db = TestSessionLocal() + db = SessionLocal() yield db finally: db.close() diff --git a/tests/pre_test.py b/tests/pre_test.py new file mode 100644 index 000000000..c1483e003 --- /dev/null +++ b/tests/pre_test.py @@ -0,0 +1,7 @@ +from mealie.core.config import app_dirs, settings + +# Monkeypatch Database Testing +DB_URL = app_dirs.DATA_DIR.joinpath("test.db") +DB_URL.unlink(missing_ok=True) + +settings.DB_URL = "sqlite:///" + str(DB_URL.absolute())