Skip to content

Commit f9a044f

Browse files
committed
Fix tests after refactoring the review admin
1 parent d4f119f commit f9a044f

1 file changed

Lines changed: 20 additions & 68 deletions

File tree

backend/reviews/tests/test_admin.py

Lines changed: 20 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,8 @@ def test_grants_review_scores(rf, scores, avg):
184184
score=all_scores[-1],
185185
)
186186

187-
request = rf.get("/")
188-
request.user = users[5]
189-
190-
admin = ReviewSessionAdmin(ReviewSession, AdminSite())
191-
response = admin._review_grants_recap_view(request, review_session)
192-
context_data = response.context_data
193-
items = context_data["items"]
187+
adapter = get_review_adapter(review_session)
188+
items = adapter.get_recap_items_queryset(review_session).all()
194189
grant_to_check = next(item for item in items if item.id == grant_1.id)
195190

196191
assert grant_to_check.id == grant_1.id
@@ -405,9 +400,7 @@ def test_review_start_view(rf, mocker):
405400
)
406401

407402

408-
def test_save_review_grants_updates_grant_and_creates_reimbursements(rf, mocker):
409-
mock_messages = mocker.patch("reviews.admin.messages")
410-
403+
def test_save_review_grants_updates_grant_and_creates_reimbursements(rf):
411404
user = UserFactory(is_staff=True, is_superuser=True)
412405
conference = ConferenceFactory()
413406

@@ -462,15 +455,8 @@ def test_save_review_grants_updates_grant_and_creates_reimbursements(rf, mocker)
462455
request = rf.post("/", data=post_data)
463456
request.user = user
464457

465-
admin = ReviewSessionAdmin(ReviewSession, AdminSite())
466-
response = admin._review_grants_recap_view(request, review_session)
467-
468-
# Should redirect after successful save
469-
assert response.status_code == 302
470-
assert (
471-
response.url
472-
== f"/admin/reviews/reviewsession/{review_session.id}/review/recap/"
473-
)
458+
adapter = get_review_adapter(review_session)
459+
adapter.process_recap_post(request, review_session)
474460

475461
# Refresh grants from database
476462
grant_1.refresh_from_db()
@@ -519,14 +505,8 @@ def test_save_review_grants_updates_grant_and_creates_reimbursements(rf, mocker)
519505
change_message=f"[Review Session] Reimbursement {accommodation_category.name} added.",
520506
).exists()
521507

522-
mock_messages.success.assert_called_once()
523-
524-
525-
def test_save_review_grants_update_grants_status_to_rejected_removes_reimbursements(
526-
rf, mocker
527-
):
528-
mocker.patch("reviews.admin.messages")
529508

509+
def test_save_review_grants_update_grants_status_to_rejected_removes_reimbursements(rf):
530510
user = UserFactory(is_staff=True, is_superuser=True)
531511
conference = ConferenceFactory()
532512

@@ -583,15 +563,9 @@ def test_save_review_grants_update_grants_status_to_rejected_removes_reimburseme
583563
request = rf.post("/", data=post_data)
584564
request.user = user
585565

586-
admin = ReviewSessionAdmin(ReviewSession, AdminSite())
587-
response = admin._review_grants_recap_view(request, review_session)
566+
adapter = get_review_adapter(review_session)
567+
adapter.process_recap_post(request, review_session)
588568

589-
# Should redirect after successful save
590-
assert response.status_code == 302
591-
assert (
592-
response.url
593-
== f"/admin/reviews/reviewsession/{review_session.id}/review/recap/"
594-
)
595569
grant_1.refresh_from_db()
596570

597571
assert grant_1.pending_status == Grant.Status.rejected
@@ -607,9 +581,7 @@ def test_save_review_grants_update_grants_status_to_rejected_removes_reimburseme
607581
).exists()
608582

609583

610-
def test_save_review_grants_modify_reimbursements(rf, mocker):
611-
mocker.patch("reviews.admin.messages")
612-
584+
def test_save_review_grants_modify_reimbursements(rf):
613585
user = UserFactory(is_staff=True, is_superuser=True)
614586
conference = ConferenceFactory()
615587

@@ -666,15 +638,8 @@ def test_save_review_grants_modify_reimbursements(rf, mocker):
666638
request = rf.post("/", data=post_data)
667639
request.user = user
668640

669-
admin = ReviewSessionAdmin(ReviewSession, AdminSite())
670-
response = admin._review_grants_recap_view(request, review_session)
671-
672-
# Should redirect after successful save
673-
assert response.status_code == 302
674-
assert (
675-
response.url
676-
== f"/admin/reviews/reviewsession/{review_session.id}/review/recap/"
677-
)
641+
adapter = get_review_adapter(review_session)
642+
adapter.process_recap_post(request, review_session)
678643

679644
grant_1.refresh_from_db()
680645

@@ -704,12 +669,9 @@ def test_save_review_grants_modify_reimbursements(rf, mocker):
704669
).exists()
705670

706671

707-
def test_save_review_grants_waiting_list_does_not_create_reimbursments(rf, mocker):
708-
mock_messages = mocker.patch("reviews.admin.messages")
709-
672+
def test_save_review_grants_waiting_list_does_not_create_reimbursements(rf):
710673
user = UserFactory(is_staff=True, is_superuser=True)
711674
conference = ConferenceFactory()
712-
713675
# Create reimbursement categories
714676
travel_category = GrantReimbursementCategoryFactory(
715677
conference=conference,
@@ -756,15 +718,8 @@ def test_save_review_grants_waiting_list_does_not_create_reimbursments(rf, mocke
756718
request = rf.post("/", data=post_data)
757719
request.user = user
758720

759-
admin = ReviewSessionAdmin(ReviewSession, AdminSite())
760-
response = admin._review_grants_recap_view(request, review_session)
761-
762-
# Should redirect after successful save
763-
assert response.status_code == 302
764-
assert (
765-
response.url
766-
== f"/admin/reviews/reviewsession/{review_session.id}/review/recap/"
767-
)
721+
adapter = get_review_adapter(review_session)
722+
adapter.process_recap_post(request, review_session)
768723

769724
# Refresh grants from database
770725
grant_1.refresh_from_db()
@@ -781,16 +736,13 @@ def test_save_review_grants_waiting_list_does_not_create_reimbursments(rf, mocke
781736
# Verify log entries were created
782737
assert (
783738
LogEntry.objects.filter(object_id=grant_1.id).count() == 1
784-
) # 1 pending_status change, 2 reimbursement additions
739+
) # 1 pending_status change
785740
assert (
786741
LogEntry.objects.filter(object_id=grant_2.id).count() == 1
787-
) # 1 pending_status change, 3 reimbursement additions
788-
mock_messages.success.assert_called_once()
789-
742+
) # 1 pending_status change
790743

791-
def test_save_review_grants_two_times_does_not_create_duplicate_log_entries(rf, mocker):
792-
mocker.patch("reviews.admin.messages")
793744

745+
def test_save_review_grants_two_times_does_not_create_duplicate_log_entries(rf):
794746
user = UserFactory(is_staff=True, is_superuser=True)
795747
conference = ConferenceFactory()
796748

@@ -832,9 +784,9 @@ def test_save_review_grants_two_times_does_not_create_duplicate_log_entries(rf,
832784
request = rf.post("/", data=post_data)
833785
request.user = user
834786

835-
admin = ReviewSessionAdmin(ReviewSession, AdminSite())
836-
admin._review_grants_recap_view(request, review_session) # First save
837-
admin._review_grants_recap_view(request, review_session) # Second save
787+
adapter = get_review_adapter(review_session)
788+
adapter.process_recap_post(request, review_session) # First save
789+
adapter.process_recap_post(request, review_session) # Second save
838790

839791
grant_1.refresh_from_db()
840792

0 commit comments

Comments
 (0)