diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index 9cfe00cb6..04f77932a 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -46,12 +46,12 @@ jobs: #---------------------------------------------- # load cached venv if cache exists #---------------------------------------------- - # - name: Load cached venv - # id: cached-poetry-dependencies - # uses: actions/cache@v2 - # with: - # path: .venv - # key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }} + - name: Load cached venv + id: cached-poetry-dependencies + uses: actions/cache@v2 + with: + path: .venv + key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }} #---------------------------------------------- # install dependencies if cache does not exist #---------------------------------------------- diff --git a/tests/conftest.py b/tests/conftest.py index f641f27e6..ba2bf89d0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,14 +6,14 @@ import requests from fastapi.testclient import TestClient from mealie.app import app from mealie.db.db_setup import SessionLocal, generate_session -from mealie.db.init_db import init_db +from mealie.db.init_db import main from pytest import fixture 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 -init_db(SessionLocal()) +main() def override_get_db():