Made more fixes for the deploy tests

Author: kevinjnev

.github/workflows/deploy.yml

@@ -48,7 +48,7 @@ jobs:
         POSTGRES_PASSWORD: postgres
         POSTGRES_DB: test_db
         SECRET_KEY: test-secret-key-for-testing
-        FIRST_SUPERUSER: test@example.com
+        FIRST_SUPERUSER: admin@example.com
         FIRST_SUPERUSER_PASSWORD: testpassword
         ENVIRONMENT: local
       run: |
@@ -64,7 +64,7 @@ jobs:
         POSTGRES_PASSWORD: postgres
         POSTGRES_DB: test_db
         SECRET_KEY: test-secret-key-for-testing
-        FIRST_SUPERUSER: test@example.com
+        FIRST_SUPERUSER: admin@example.com
         FIRST_SUPERUSER_PASSWORD: testpassword
         ENVIRONMENT: local
       run: |

backend/tests/conftest.py

@@ -7,7 +7,7 @@
 from app.core.config import settings
 from app.core.db import engine, init_db
 from app.main import app
-from app.models import Item, User
+from app.models import Item, Organization, User
 from tests.utils.user import authentication_token_from_email
 from tests.utils.utils import get_superuser_token_headers
 
@@ -17,10 +17,13 @@ def db() -> Generator[Session, None, None]:
     with Session(engine) as session:
         init_db(session)
         yield session
+        # Clean up in proper order due to foreign key constraints
         statement = delete(Item)
         session.execute(statement)
         statement = delete(User)
         session.execute(statement)
+        statement = delete(Organization)
+        session.execute(statement)
         session.commit()