test: rename db_db_session to db_session across test files

- Standardized test fixture naming from db_db_session to db_session
- Updated all test files to use consistent parameter naming
- All tests now passing with the new naming convention
This commit is contained in:
2025-09-23 12:20:38 -06:00
parent 27b3b9cdee
commit 1c9e8b9cde
9 changed files with 261 additions and 141 deletions

View File

@@ -10,11 +10,11 @@ from reflector.db.rooms import rooms_controller
@pytest.mark.asyncio
async def test_multiple_active_meetings_per_room(db_db_session):
async def test_multiple_active_meetings_per_room(db_session):
"""Test that multiple active meetings can exist for the same room."""
# Create a room
room = await rooms_controller.add(
session,
db_session,
name="test-room",
user_id="test-user",
zulip_auto_post=False,
@@ -32,7 +32,7 @@ async def test_multiple_active_meetings_per_room(db_db_session):
# Create first meeting
meeting1 = await meetings_controller.create(
session,
db_session,
id="meeting-1",
room_name="test-meeting-1",
room_url="https://whereby.com/test-1",
@@ -44,7 +44,7 @@ async def test_multiple_active_meetings_per_room(db_db_session):
# Create second meeting for the same room (should succeed now)
meeting2 = await meetings_controller.create(
session,
db_session,
id="meeting-2",
room_name="test-meeting-2",
room_url="https://whereby.com/test-2",
@@ -56,7 +56,7 @@ async def test_multiple_active_meetings_per_room(db_db_session):
# Both meetings should be active
active_meetings = await meetings_controller.get_all_active_for_room(
session, room=room, current_time=current_time
db_session, room=room, current_time=current_time
)
assert len(active_meetings) == 2
@@ -65,11 +65,11 @@ async def test_multiple_active_meetings_per_room(db_db_session):
@pytest.mark.asyncio
async def test_get_active_by_calendar_event(db_db_session):
async def test_get_active_by_calendar_event(db_session):
"""Test getting active meeting by calendar event ID."""
# Create a room
room = await rooms_controller.add(
session,
db_session,
name="test-room",
user_id="test-user",
zulip_auto_post=False,
@@ -90,14 +90,14 @@ async def test_get_active_by_calendar_event(db_db_session):
start_time=datetime.now(timezone.utc),
end_time=datetime.now(timezone.utc) + timedelta(hours=1),
)
event = await calendar_events_controller.upsert(session, event)
event = await calendar_events_controller.upsert(db_session, event)
current_time = datetime.now(timezone.utc)
end_time = current_time + timedelta(hours=2)
# Create meeting linked to calendar event
meeting = await meetings_controller.create(
session,
db_session,
id="meeting-cal-1",
room_name="test-meeting-cal",
room_url="https://whereby.com/test-cal",
@@ -111,7 +111,7 @@ async def test_get_active_by_calendar_event(db_db_session):
# Should find the meeting by calendar event
found_meeting = await meetings_controller.get_active_by_calendar_event(
session, room=room, calendar_event_id=event.id, current_time=current_time
db_session, room=room, calendar_event_id=event.id, current_time=current_time
)
assert found_meeting is not None
@@ -120,11 +120,11 @@ async def test_get_active_by_calendar_event(db_db_session):
@pytest.mark.asyncio
async def test_calendar_meeting_deactivates_after_scheduled_end(db_db_session):
async def test_calendar_meeting_deactivates_after_scheduled_end(db_session):
"""Test that unused calendar meetings deactivate after scheduled end time."""
# Create a room
room = await rooms_controller.add(
session,
db_session,
name="test-room",
user_id="test-user",
zulip_auto_post=False,
@@ -145,13 +145,13 @@ async def test_calendar_meeting_deactivates_after_scheduled_end(db_db_session):
start_time=datetime.now(timezone.utc) - timedelta(hours=2),
end_time=datetime.now(timezone.utc) - timedelta(minutes=35),
)
event = await calendar_events_controller.upsert(session, event)
event = await calendar_events_controller.upsert(db_session, event)
current_time = datetime.now(timezone.utc)
# Create meeting linked to calendar event
meeting = await meetings_controller.create(
session,
db_session,
id="meeting-unused",
room_name="test-meeting-unused",
room_url="https://whereby.com/test-unused",
@@ -168,7 +168,9 @@ async def test_calendar_meeting_deactivates_after_scheduled_end(db_db_session):
# Simulate process_meetings logic for unused calendar meeting past end time
if meeting.calendar_event_id and current_time > meeting.end_date:
# In real code, we'd check has_had_sessions = False here
await meetings_controller.update_meeting(session, meeting.id, is_active=False)
await meetings_controller.update_meeting(
db_session, meeting.id, is_active=False
)
updated_meeting = await meetings_controller.get_by_id(session, meeting.id)
updated_meeting = await meetings_controller.get_by_id(db_session, meeting.id)
assert updated_meeting.is_active is False # Deactivated after scheduled end