fix: resolve review round 2, E2E failures, and mypy error
Review blocker A — form error swap and false success: - Change HTMX contract so forms target their own container (outerHTML) instead of appending to #comments-list - Use OOB swaps to append approved comments to the correct target - Add success/error message display inside form templates - Remove hx-on::after-request handlers (no longer needed) Review blocker B — reply rendering shape: - Create _reply.html partial with compact reply markup - Approved replies via HTMX now use compact template + OOB swap into parent's .replies-container - Reply form errors render inside reply form container E2E test fixes: - Update 4 failing tests to wait for inline HTMX messages instead of redirect-based URL assertions - Add aria-label='Comment form errors' to form error display - Rename test_reply_submission_redirects to test_reply_submission_shows_moderation_message Mypy internal error workaround: - Add mypy override for apps.comments.views (django-stubs triggers internal error on ORM annotate() chain with mypy 1.11.2) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -23,12 +23,12 @@ def _submit_comment(page: Page, *, name: str = "E2E Tester", email: str = "e2e@e
|
||||
|
||||
@pytest.mark.e2e
|
||||
def test_valid_comment_shows_moderation_message(page: Page, base_url: str) -> None:
|
||||
"""Successful comment submission must show the awaiting-moderation banner."""
|
||||
"""Successful comment submission must show the awaiting-moderation message."""
|
||||
_go_to_article(page, base_url)
|
||||
_submit_comment(page, body="This is a test comment from Playwright.")
|
||||
|
||||
page.wait_for_url(lambda url: "commented=1" in url, timeout=10_000)
|
||||
expect(page.get_by_text("Your comment is awaiting moderation")).to_be_visible()
|
||||
# HTMX swaps the form container inline — wait for the moderation message
|
||||
expect(page.get_by_text("awaiting moderation")).to_be_visible(timeout=10_000)
|
||||
|
||||
|
||||
@pytest.mark.e2e
|
||||
@@ -38,7 +38,8 @@ def test_valid_comment_not_immediately_visible(page: Page, base_url: str) -> Non
|
||||
unique_body = "Unique unmoderated comment body xq7z"
|
||||
_submit_comment(page, body=unique_body)
|
||||
|
||||
page.wait_for_url(lambda url: "commented=1" in url, timeout=10_000)
|
||||
# Wait for HTMX response to settle
|
||||
expect(page.get_by_text("awaiting moderation")).to_be_visible(timeout=10_000)
|
||||
expect(page.get_by_text(unique_body)).not_to_be_visible()
|
||||
|
||||
|
||||
@@ -48,7 +49,7 @@ def test_empty_body_shows_form_errors(page: Page, base_url: str) -> None:
|
||||
_submit_comment(page, body=" ") # whitespace-only body
|
||||
page.wait_for_load_state("networkidle")
|
||||
|
||||
expect(page.locator('[aria-label="Comment form errors"]')).to_be_visible()
|
||||
expect(page.locator('[aria-label="Comment form errors"]')).to_be_visible(timeout=10_000)
|
||||
assert "commented=1" not in page.url
|
||||
|
||||
|
||||
@@ -78,8 +79,8 @@ def test_reply_form_visible_on_approved_comment(page: Page, base_url: str) -> No
|
||||
|
||||
|
||||
@pytest.mark.e2e
|
||||
def test_reply_submission_redirects(page: Page, base_url: str) -> None:
|
||||
"""Submitting a reply to an approved comment should redirect with commented=1."""
|
||||
def test_reply_submission_shows_moderation_message(page: Page, base_url: str) -> None:
|
||||
"""Submitting a reply to an approved comment should show moderation message."""
|
||||
_go_to_article(page, base_url)
|
||||
|
||||
# The reply form is always visible below the approved seeded comment
|
||||
@@ -89,8 +90,8 @@ def test_reply_submission_redirects(page: Page, base_url: str) -> None:
|
||||
reply_form.locator('textarea[name="body"]').fill("This is a test reply.")
|
||||
reply_form.get_by_role("button", name="Reply").click()
|
||||
|
||||
page.wait_for_url(lambda url: "commented=1" in url, timeout=10_000)
|
||||
expect(page.get_by_text("Your comment is awaiting moderation")).to_be_visible()
|
||||
# HTMX swaps the reply form container inline
|
||||
expect(page.get_by_text("awaiting moderation")).to_be_visible(timeout=10_000)
|
||||
|
||||
|
||||
@pytest.mark.e2e
|
||||
|
||||
Reference in New Issue
Block a user