Fix tests after refactoring the review admin

Author: estyxx

backend/reviews/tests/test_admin.py

@@ -184,13 +184,8 @@ def test_grants_review_scores(rf, scores, avg):
         score=all_scores[-1],
     )
 
-    request = rf.get("/")
-    request.user = users[5]
-
-    admin = ReviewSessionAdmin(ReviewSession, AdminSite())
-    response = admin._review_grants_recap_view(request, review_session)
-    context_data = response.context_data
-    items = context_data["items"]
+    adapter = get_review_adapter(review_session)
+    items = adapter.get_recap_items_queryset(review_session).all()
     grant_to_check = next(item for item in items if item.id == grant_1.id)
 
     assert grant_to_check.id == grant_1.id
@@ -285,9 +280,7 @@ def test_review_start_view(rf, mocker):
     )
 
 
-def test_save_review_grants_updates_grant_and_creates_reimbursements(rf, mocker):
-    mock_messages = mocker.patch("reviews.admin.messages")
-
+def test_save_review_grants_updates_grant_and_creates_reimbursements(rf):
     user = UserFactory(is_staff=True, is_superuser=True)
     conference = ConferenceFactory()
 
@@ -342,15 +335,8 @@ def test_save_review_grants_updates_grant_and_creates_reimbursements(rf, mocker)
     request = rf.post("/", data=post_data)
     request.user = user
 
-    admin = ReviewSessionAdmin(ReviewSession, AdminSite())
-    response = admin._review_grants_recap_view(request, review_session)
-
-    # Should redirect after successful save
-    assert response.status_code == 302
-    assert (
-        response.url
-        == f"/admin/reviews/reviewsession/{review_session.id}/review/recap/"
-    )
+    adapter = get_review_adapter(review_session)
+    adapter.process_recap_post(request, review_session)
 
     # Refresh grants from database
     grant_1.refresh_from_db()
@@ -399,14 +385,8 @@ def test_save_review_grants_updates_grant_and_creates_reimbursements(rf, mocker)
         change_message=f"[Review Session] Reimbursement {accommodation_category.name} added.",
     ).exists()
 
-    mock_messages.success.assert_called_once()
-
-
-def test_save_review_grants_update_grants_status_to_rejected_removes_reimbursements(
-    rf, mocker
-):
-    mocker.patch("reviews.admin.messages")
 
+def test_save_review_grants_update_grants_status_to_rejected_removes_reimbursements(rf):
     user = UserFactory(is_staff=True, is_superuser=True)
     conference = ConferenceFactory()
 
@@ -463,15 +443,9 @@ def test_save_review_grants_update_grants_status_to_rejected_removes_reimburseme
     request = rf.post("/", data=post_data)
     request.user = user
 
-    admin = ReviewSessionAdmin(ReviewSession, AdminSite())
-    response = admin._review_grants_recap_view(request, review_session)
+    adapter = get_review_adapter(review_session)
+    adapter.process_recap_post(request, review_session)
 
-    # Should redirect after successful save
-    assert response.status_code == 302
-    assert (
-        response.url
-        == f"/admin/reviews/reviewsession/{review_session.id}/review/recap/"
-    )
     grant_1.refresh_from_db()
 
     assert grant_1.pending_status == Grant.Status.rejected
@@ -487,9 +461,7 @@ def test_save_review_grants_update_grants_status_to_rejected_removes_reimburseme
         ).exists()
 
 
-def test_save_review_grants_modify_reimbursements(rf, mocker):
-    mocker.patch("reviews.admin.messages")
-
+def test_save_review_grants_modify_reimbursements(rf):
     user = UserFactory(is_staff=True, is_superuser=True)
     conference = ConferenceFactory()
 
@@ -546,15 +518,8 @@ def test_save_review_grants_modify_reimbursements(rf, mocker):
     request = rf.post("/", data=post_data)
     request.user = user
 
-    admin = ReviewSessionAdmin(ReviewSession, AdminSite())
-    response = admin._review_grants_recap_view(request, review_session)
-
-    # Should redirect after successful save
-    assert response.status_code == 302
-    assert (
-        response.url
-        == f"/admin/reviews/reviewsession/{review_session.id}/review/recap/"
-    )
+    adapter = get_review_adapter(review_session)
+    adapter.process_recap_post(request, review_session)
 
     grant_1.refresh_from_db()
 
@@ -584,12 +549,9 @@ def test_save_review_grants_modify_reimbursements(rf, mocker):
     ).exists()
 
 
-def test_save_review_grants_waiting_list_does_not_create_reimbursments(rf, mocker):
-    mock_messages = mocker.patch("reviews.admin.messages")
-
+def test_save_review_grants_waiting_list_does_not_create_reimbursements(rf):
     user = UserFactory(is_staff=True, is_superuser=True)
     conference = ConferenceFactory()
-
     # Create reimbursement categories
     travel_category = GrantReimbursementCategoryFactory(
         conference=conference,
@@ -636,15 +598,8 @@ def test_save_review_grants_waiting_list_does_not_create_reimbursments(rf, mocke
     request = rf.post("/", data=post_data)
     request.user = user
 
-    admin = ReviewSessionAdmin(ReviewSession, AdminSite())
-    response = admin._review_grants_recap_view(request, review_session)
-
-    # Should redirect after successful save
-    assert response.status_code == 302
-    assert (
-        response.url
-        == f"/admin/reviews/reviewsession/{review_session.id}/review/recap/"
-    )
+    adapter = get_review_adapter(review_session)
+    adapter.process_recap_post(request, review_session)
 
     # Refresh grants from database
     grant_1.refresh_from_db()
@@ -661,16 +616,13 @@ def test_save_review_grants_waiting_list_does_not_create_reimbursments(rf, mocke
     # Verify log entries were created
     assert (
         LogEntry.objects.filter(object_id=grant_1.id).count() == 1
-    )  # 1 pending_status change, 2 reimbursement additions
+    )  # 1 pending_status change
     assert (
         LogEntry.objects.filter(object_id=grant_2.id).count() == 1
-    )  # 1 pending_status change, 3 reimbursement additions
-    mock_messages.success.assert_called_once()
-
+    )  # 1 pending_status change
 
-def test_save_review_grants_two_times_does_not_create_duplicate_log_entries(rf, mocker):
-    mocker.patch("reviews.admin.messages")
 
+def test_save_review_grants_two_times_does_not_create_duplicate_log_entries(rf):
     user = UserFactory(is_staff=True, is_superuser=True)
     conference = ConferenceFactory()
 
@@ -712,9 +664,9 @@ def test_save_review_grants_two_times_does_not_create_duplicate_log_entries(rf,
     request = rf.post("/", data=post_data)
     request.user = user
 
-    admin = ReviewSessionAdmin(ReviewSession, AdminSite())
-    admin._review_grants_recap_view(request, review_session)  # First save
-    admin._review_grants_recap_view(request, review_session)  # Second save
+    adapter = get_review_adapter(review_session)
+    adapter.process_recap_post(request, review_session)  # First save
+    adapter.process_recap_post(request, review_session)  # Second save
 
     grant_1.refresh_from_db()