2
2
import os
3
3
from typing import Generator
4
4
from sqlmodel import create_engine , Session , select
5
- from sqlalchemy import Engine
6
5
from fastapi .testclient import TestClient
7
6
from dotenv import load_dotenv
8
7
from utils .core .db import get_connection_url , tear_down_db , set_up_db , create_default_roles , ensure_database_exists
9
- from utils .core .models import User , PasswordResetToken , EmailUpdateToken , Organization , Role , Account , Invitation
8
+ from utils .core .models import User , Organization , Role , Account , Invitation
10
9
from utils .core .auth import get_password_hash , create_access_token , create_refresh_token
11
10
from main import app
12
11
from datetime import datetime , UTC , timedelta
@@ -21,17 +20,13 @@ def __init__(self, message="An error occurred during test setup"):
21
20
22
21
@pytest .fixture
23
22
def env_vars (monkeypatch ):
24
- # Get valid db user, password, host, and port from .env
25
23
load_dotenv ()
26
- os .environ ["DB_HOST" ] = os .getenv ("DB_HOST" , "localhost" )
27
- os .environ ["DB_PORT" ] = os .getenv ("DB_PORT" , "5432" )
28
- os .environ ["DB_USER" ] = os .getenv ("DB_USER" , "appuser" )
29
- os .environ ["DB_PASSWORD" ] = os .getenv ("DB_PASSWORD" , "testpassword" )
30
24
31
25
# monkeypatch remaining env vars
32
26
with monkeypatch .context () as m :
33
27
m .setenv ("SECRET_KEY" , "testsecretkey" )
34
28
m .setenv ("HOST_NAME" , "Test Organization" )
29
+ # Get valid db user, password, host, and port from env
35
30
m .setenv ("DB_HOST" , os .getenv ("DB_HOST" , "localhost" ))
36
31
m .setenv ("DB_PORT" , os .getenv ("DB_PORT" , "5432" ))
37
32
m .setenv ("DB_USER" , os .getenv ("DB_USER" , "appuser" ))
0 commit comments