aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--tests/tasks/test_scanner.py54
-rw-r--r--tests/tasks/test_source_parser.py5
-rw-r--r--tests/tasks/test_verification.py18
-rw-r--r--tests/test_cli.py5
-rw-r--r--tests/test_migration_env.py7
-rw-r--r--tests/test_net.py3
-rw-r--r--tests/views/test_moderation.py5
-rw-r--r--tests/views/test_received.py3
-rw-r--r--tests/views/test_sent.py504
9 files changed, 506 insertions, 98 deletions
diff --git a/tests/tasks/test_scanner.py b/tests/tasks/test_scanner.py
index af5a64e..dae4628 100644
--- a/tests/tasks/test_scanner.py
+++ b/tests/tasks/test_scanner.py
@@ -1521,3 +1521,57 @@ def test_failed_scan_does_not_update_completion_time(
state = db.session.get(ScanState, 1)
assert state is not None
assert state.last_completed_at == previous_time
+
+
+def test_source_lifecycle_history_records_real_transitions_only(
+ app: Flask, scanner_module: ModuleType
+) -> None:
+ """An unchanged rescan is not an event; changes are preserved per source."""
+ from webmentions_ssg.models.sources import SourceDocumentEvent
+
+ timestamp = datetime(2026, 11, 1, tzinfo=UTC)
+ original = source_parser.ScannedSource(
+ path="tracked/index.html",
+ url="https://site.example/tracked/",
+ content_hash="0" * 32,
+ targets=frozenset({"https://example.org/linked"}),
+ )
+ changed = source_parser.ScannedSource(
+ path=original.path,
+ url=original.url,
+ content_hash="1" * 32,
+ targets=original.targets,
+ )
+
+ with app.app_context():
+ source = scanner_module.build_source(original, timestamp)
+ db.session.add(source)
+ db.session.commit()
+ assert [(event.action, event.revision) for event in source.history_events] == [
+ ("Discovered", 1)
+ ]
+ scanner_module.apply_scan_to_source(
+ source, original, timestamp + timedelta(days=1)
+ )
+ assert len(source.history_events) == 1
+ scanner_module.apply_scan_to_source(
+ source, changed, timestamp + timedelta(days=2)
+ )
+ scanner_module.mark_missing_sources_deleted(
+ {source.path: source}, frozenset(), timestamp + timedelta(days=3)
+ )
+ scanner_module.apply_scan_to_source(
+ source, original, timestamp + timedelta(days=4)
+ )
+ db.session.commit()
+ persisted = db.session.scalars(
+ sa.select(SourceDocumentEvent)
+ .where(SourceDocumentEvent.source_uuid == source.uuid)
+ .order_by(SourceDocumentEvent.id)
+ ).all()
+ assert [(event.action, event.revision) for event in persisted] == [
+ ("Discovered", 1),
+ ("Revised", 2),
+ ("Deleted", 3),
+ ("Restored", 4),
+ ]
diff --git a/tests/tasks/test_source_parser.py b/tests/tasks/test_source_parser.py
index 38a5dc1..8c9b74a 100644
--- a/tests/tasks/test_source_parser.py
+++ b/tests/tasks/test_source_parser.py
@@ -1035,10 +1035,7 @@ def test_outgoing_targets_skip_urls_with_unparseable_hostname(
monkeypatch.setattr(source_parser_module, "normalize_hostname", invalid_hostname)
assert list(
source_parser_module.iter_outgoing_targets(
- content,
- {},
- base_url=SOURCE_URL,
- source_url=SOURCE_URL,
+ content, {}, base_url=SOURCE_URL, source_url=SOURCE_URL
)
) == ["https://good.example/post"]
diff --git a/tests/tasks/test_verification.py b/tests/tasks/test_verification.py
index d9c2f77..a581cc1 100644
--- a/tests/tasks/test_verification.py
+++ b/tests/tasks/test_verification.py
@@ -849,9 +849,12 @@ def test_verification_claim_race_rolls_back_without_status_event(
row = db.session.get(ReceivedWebmention, identifier)
assert row is not None
assert row.status == "received"
- assert db.session.scalar(
- sa.select(sa.func.count(ReceivedWebmentionStatusEvent.id))
- ) == 0
+ assert (
+ db.session.scalar(
+ sa.select(sa.func.count(ReceivedWebmentionStatusEvent.id))
+ )
+ == 0
+ )
def test_stale_verification_claim_race_does_not_enqueue(
@@ -870,7 +873,10 @@ def test_stale_verification_claim_race_does_not_enqueue(
row = db.session.get(ReceivedWebmention, identifier)
assert row is not None
assert row.status == "verifying"
- assert db.session.scalar(
- sa.select(sa.func.count(ReceivedWebmentionStatusEvent.id))
- ) == 0
+ assert (
+ db.session.scalar(
+ sa.select(sa.func.count(ReceivedWebmentionStatusEvent.id))
+ )
+ == 0
+ )
enqueue.assert_not_called()
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 1507544..d8781ea 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -916,8 +916,9 @@ def test_all_migrations_can_downgrade_to_empty_schema(database_app: Flask) -> No
assert tables <= {"alembic_version"}
if "alembic_version" in tables:
assert (
- connection.execute(sa.text("SELECT count(*) FROM alembic_version"))
- .scalar_one()
+ connection.execute(
+ sa.text("SELECT count(*) FROM alembic_version")
+ ).scalar_one()
== 0
)
diff --git a/tests/test_migration_env.py b/tests/test_migration_env.py
index 07462dc..7ae09bb 100644
--- a/tests/test_migration_env.py
+++ b/tests/test_migration_env.py
@@ -40,12 +40,7 @@ def test_offline_migration_uses_legacy_engine_url_and_metadata(
patcher.setattr(context, "run_migrations", run_migrations, raising=False)
runpy.run_path(
- str(
- Path(__file__).parents[1]
- / "webmentions_ssg"
- / "migrations"
- / "env.py"
- )
+ str(Path(__file__).parents[1] / "webmentions_ssg" / "migrations" / "env.py")
)
config.set_main_option.assert_called_once_with(
diff --git a/tests/test_net.py b/tests/test_net.py
index ec62472..99410d0 100644
--- a/tests/test_net.py
+++ b/tests/test_net.py
@@ -6,11 +6,10 @@
import ipaddress
import socket
-
-import dns.exception
from http import HTTPStatus
from unittest.mock import Mock, PropertyMock, patch
+import dns.exception
import httpcore
import httpx
import pytest
diff --git a/tests/views/test_moderation.py b/tests/views/test_moderation.py
index 92446c4..31f17bc 100644
--- a/tests/views/test_moderation.py
+++ b/tests/views/test_moderation.py
@@ -329,10 +329,7 @@ def test_moderation_add_recovers_from_duplicate_insert_race(
@pytest.mark.parametrize("kind", ["invalid", "blocked"])
def test_moderation_delete_rejects_bad_kind_or_invalid_form(
- app: Flask,
- client: FlaskClient,
- monkeypatch: pytest.MonkeyPatch,
- kind: str,
+ app: Flask, client: FlaskClient, monkeypatch: pytest.MonkeyPatch, kind: str
) -> None:
from webmentions_ssg.views import moderation
diff --git a/tests/views/test_received.py b/tests/views/test_received.py
index baea6c7..384f2af 100644
--- a/tests/views/test_received.py
+++ b/tests/views/test_received.py
@@ -1406,8 +1406,7 @@ def test_single_received_block_source_rejects_invalid_request(
) -> None:
log_in(app, client)
identifier = create_received_webmention(
- app,
- source="not-a-url" if failure == "invalid-source" else SOURCE_URL,
+ app, source="not-a-url" if failure == "invalid-source" else SOURCE_URL
)
mock_admin_action_form(views_module, monkeypatch, valid=failure != "csrf")
diff --git a/tests/views/test_sent.py b/tests/views/test_sent.py
index 644fc6f..a9db480 100644
--- a/tests/views/test_sent.py
+++ b/tests/views/test_sent.py
@@ -50,7 +50,9 @@ def sent_module(app: Flask) -> ModuleType:
return module
-@pytest.mark.parametrize("path", ["/sent", f"/sent/{uuid.uuid7()}"])
+@pytest.mark.parametrize(
+ "path", ["/sent", f"/sent/{uuid.uuid7()}", f"/sent/{uuid.uuid7()}/{uuid.uuid7()}"]
+)
def test_sent_views_require_login(client: FlaskClient, path: str) -> None:
response = client.get(path)
@@ -74,7 +76,7 @@ def test_sent_lists_source_documents(app: Flask, client: FlaskClient) -> None:
assert "1 source document" in html
assert soup.select_one('form[action="/sent"]') is not None
assert "blog/example/index.html" in html
- assert "https://dennisfink.me/blog/example/" in html
+ assert "https://dennisfink.me/blog/example/" not in html
assert f"/sent/{identifier}" in html
@@ -92,16 +94,13 @@ def test_sent_source_documents_table_hides_secondary_columns_on_mobile(
assert table is not None
headers = table.select("thead th")
cells = table.select("tbody tr:first-child td")
- assert len(headers) == len(cells) == 8
- for index in (2, 4, 5, 6): # URL, revision, created, last seen
- for cell in (headers[index], cells[index]):
- assert {"d-none", "d-md-table-cell"} <= set(
- cell.get_attribute_list("class")
- )
- for index in (0, 1, 3, 7): # Status, path, counts, details stay visible
+ assert len(headers) == len(cells) == 5
+ assert {"d-none", "d-md-table-cell"} <= set(headers[3].get_attribute_list("class"))
+ assert {"d-none", "d-md-table-cell"} <= set(cells[3].get_attribute_list("class"))
+ for index in (0, 1, 2, 4): # Status, path, counts, details stay visible
assert "d-none" not in cells[index].get_attribute_list("class")
assert "text-break" in cells[1].get_attribute_list("class")
- details = cells[7].select_one('a.btn[href^="/sent/"]')
+ details = cells[4].select_one('a.btn[href^="/sent/"]')
assert details is not None
assert details.get_text(strip=True) == "Details"
@@ -128,8 +127,16 @@ def test_sent_source_lists_webmentions(app: Flask, client: FlaskClient) -> None:
assert second_target in html
assert html.index(first_target) < html.index(second_target)
- assert "Webmention endpoint returned HTTP 400" in html
- assert "https://example.com/webmention" in html
+ assert "Webmention endpoint returned HTTP 400" not in html
+ assert "https://example.com/webmention" not in html
+ assert (
+ len(
+ BeautifulSoup(html, "html.parser").select(
+ 'a[aria-label^="Details for Webmention"]'
+ )
+ )
+ == 2
+ )
def test_sent_webmentions_table_keeps_status_and_actions_on_mobile(
@@ -146,15 +153,15 @@ def test_sent_webmentions_table_keeps_status_and_actions_on_mobile(
assert table is not None
headers = table.select("thead th")
cells = table.select("tbody tr:first-child td")
- assert len(headers) == len(cells) == 7
- for index in (2, 3, 4, 5): # Active, revisions, delivery, activity
+ assert len(headers) == len(cells) == 5
+ for index in (2, 3): # Link and last attempt
for cell in (headers[index], cells[index]):
assert {"d-none", "d-md-table-cell"} <= set(
cell.get_attribute_list("class")
)
- for index in (0, 1, 6): # Target, status, resend action stay visible
+ for index in (0, 1, 4): # Status, target, details stay visible
assert "d-none" not in cells[index].get_attribute_list("class")
- assert cells[6].select_one("button[data-action]") is not None
+ assert cells[4].select_one('a[href^="/sent/"]') is not None
def test_sent_source_returns_404_for_unknown_source(
@@ -317,7 +324,9 @@ def test_resend_sent_webmention_reopens_current_revision(
def test_admin_only_links_safe_existing_status_urls(
app: Flask, client: FlaskClient, status_url: str, safe: bool
) -> None:
- source_identifier, _ = create_outgoing(app, status_url=status_url)
+ source_identifier, webmention_identifier = create_outgoing(
+ app, status_url=status_url
+ )
with app.app_context():
user = User(username="admin", password="test")
db.session.add(user)
@@ -328,11 +337,24 @@ def test_admin_only_links_safe_existing_status_urls(
session["_user_id"] = str(user_id)
session["_fresh"] = True
- response = client.get(f"/sent/{source_identifier}")
+ # Status URLs belong to individual Webmentions, not the source overview.
+ source_response = client.get(f"/sent/{source_identifier}")
+ assert source_response.status_code == HTTPStatus.OK
+ assert status_url not in source_response.get_data(as_text=True)
+
+ response = client.get(f"/sent/{source_identifier}/{webmention_identifier}")
assert response.status_code == HTTPStatus.OK
- html = response.get_data(as_text=True)
- assert (f'href="{status_url}"' in html) is safe
- assert status_url in html
+ soup = BeautifulSoup(response.get_data(as_text=True), "html.parser")
+ label = soup.find("dt", string="Status URL")
+ assert label is not None
+ status_details = label.find_next_sibling("dd")
+ assert status_details is not None
+ assert status_details.get_text(strip=True) == status_url
+ link = status_details.find("a", href=True)
+ assert (link is not None) is safe
+ if safe:
+ assert isinstance(link, Tag)
+ assert _href(link) == status_url
def make_source(
@@ -464,9 +486,7 @@ def test_sent_filter_by_inclusive_last_seen_dates(
assert "blog/new/index.html" not in html
-@pytest.mark.parametrize(
- "sort", ["path", "url", "webmentions", "revision", "created", "last_seen", "status"]
-)
+@pytest.mark.parametrize("sort", ["status", "path", "webmentions", "last_seen"])
def test_sent_sort_links_preserve_filters(
app: Flask, client: FlaskClient, sort: str
) -> None:
@@ -484,32 +504,44 @@ def test_sent_sort_links_preserve_filters(
},
)
assert response.status_code == HTTPStatus.OK
- html = response.get_data(as_text=True)
- soup = BeautifulSoup(html, "html.parser")
+ soup = BeautifulSoup(response.get_data(as_text=True), "html.parser")
assert soup.select_one('th[aria-sort="ascending"]') is not None
links = [
parse_qs(urlsplit(_href(a)).query)
for a in soup.select("th a[href]")
if urlsplit(_href(a)).path == "/sent"
]
- assert len(links) == 7
+ assert len(links) == 4
+ assert {link["sort"][0] for link in links} == {
+ "status", "path", "webmentions", "last_seen"
+ }
for link in links:
assert link["status"] == ["failing"]
assert link["q"] == ["alpha"]
assert link["date_from"] == ["2026-11-01"]
assert link["per_page"] == ["37"]
- assert link["sort"][0] in (
- "path",
- "url",
- "webmentions",
- "revision",
- "created",
- "last_seen",
- "status",
- )
assert any(link["sort"] == [sort] and link["order"] == ["desc"] for link in links)
+@pytest.mark.parametrize("sort", ["url", "revision", "created"])
+def test_sent_hidden_sort_keys_remain_supported_without_hidden_columns(
+ app: Flask, client: FlaskClient, sort: str
+) -> None:
+ log_in(app, client)
+ make_source(app, "alpha", statuses=(SentWebmentionStatus.FAILED,))
+ response = client.get(
+ "/sent", query_string={"sort": sort, "order": "asc"}
+ )
+ assert response.status_code == HTTPStatus.OK
+ soup = BeautifulSoup(response.get_data(as_text=True), "html.parser")
+ assert soup.select_one("table tbody tr") is not None
+ # Sorting these fields is still accepted, but they are intentionally absent
+ # from the simplified overview table.
+ assert soup.select_one('th[aria-sort="ascending"]') is None
+ assert len(soup.select("table thead th")) == 5
+ assert len(soup.select("table thead th a[href]")) == 4
+
+
def test_sent_sort_orders_by_count_and_path(app: Flask, client: FlaskClient) -> None:
log_in(app, client)
make_source(app, "z", statuses=(SentWebmentionStatus.SENT,))
@@ -638,7 +670,15 @@ def test_sent_show_failed_and_retrying_counts_and_retry_deadline(
response = client.get(f"/sent/{identifier}")
assert response.status_code == HTTPStatus.OK
- assert "Retry scheduled after attempt 2:" in response.get_data(as_text=True)
+ with app.app_context():
+ mention_id = db.session.scalar(
+ sa.select(SentWebmention.uuid).where(
+ SentWebmention.source_uuid == identifier
+ )
+ )
+ response = client.get(f"/sent/{identifier}/{mention_id}")
+ assert response.status_code == HTTPStatus.OK
+ assert "Next retry" in response.get_data(as_text=True)
def test_resend_preserves_source_filter_context(
@@ -723,8 +763,10 @@ def test_sent_list_and_source_use_confirmation_actions_and_detail_history(
log_in(app, client)
source_id, mention_id = create_resendable_sent_webmention(app)
with app.app_context():
+ source = db.session.get(SourceDocument, source_id)
mention = db.session.get(SentWebmention, mention_id)
- assert mention is not None
+ assert source is not None and mention is not None
+ source.record_event("Revised")
mention.record_status_event("Delivery failed")
db.session.commit()
@@ -741,19 +783,43 @@ def test_sent_list_and_source_use_confirmation_actions_and_detail_history(
)
assert detail.select_one("section.card #source-details-heading") is not None
assert detail.select_one("section #sent-webmentions-heading") is not None
- assert detail.select_one("section #status-history-heading") is not None
- history = detail.select("#status-history-heading ~ ol li")
- assert len(history) == 1
- assert "Delivery failed" in history[0].get_text()
- assert "https://example.com/resend" in history[0].get_text()
+ assert detail.select_one("section #source-history-heading") is not None
+ source_history = detail.select("#source-history-heading ~ ol li")
+ assert len(source_history) == 1
+ assert "Revised" in source_history[0].get_text()
+ assert "Delivery failed" not in detail.get_text()
+ mention_link = detail.select_one('a[aria-label^="Details for Webmention"]')
+ assert mention_link is not None
+ assert urlsplit(_href(mention_link)).path == f"/sent/{source_id}/{mention_id}"
assert detail.select_one("section table tbody tr") is not None
resend = detail.select_one('button[data-action*="resend-all"]')
assert resend is not None
assert resend.get_text(strip=True) == "Resend all"
+ resend_failed = detail.select_one('button[data-action*="resend-failed"]')
+ assert resend_failed is not None
+ assert resend_failed.get_text(strip=True) == "Resend all failed"
+ assert resend_failed.get("data-bs-target") == "#confirmation-modal"
+ assert resend_failed.get("data-confirm-label") == "Resend all failed"
+ action = resend_failed.get("data-action")
+ assert isinstance(action, str)
+ assert urlsplit(action).path == f"/sent/{source_id}/resend-failed"
+
+ mention_detail = BeautifulSoup(
+ client.get(_href(mention_link)).get_data(as_text=True), "html.parser"
+ )
+ assert mention_detail.select_one("#status-history-heading") is not None
+ assert "Delivery failed" in mention_detail.get_text()
+ assert "Revised" not in mention_detail.get_text()
+ assert mention_detail.select_one('button[data-action*="return_to=detail"]')
@pytest.mark.parametrize(
- "path", ["/sent/failed/resend", f"/sent/{uuid.uuid7()}/resend-all"]
+ "path",
+ [
+ "/sent/failed/resend",
+ f"/sent/{uuid.uuid7()}/resend-all",
+ f"/sent/{uuid.uuid7()}/resend-failed",
+ ],
)
def test_bulk_resend_requires_login(client: FlaskClient, path: str) -> None:
response = client.post(path)
@@ -823,6 +889,161 @@ def test_global_resend_all_failed_ignores_filters_and_preserves_other_statuses(
assert send.call_count == (2 if valid else 0)
+def test_source_resend_all_failed_requeues_only_this_sources_failures(
+ app: Flask,
+ client: FlaskClient,
+ sent_module: ModuleType,
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ log_in(app, client)
+ source_id = make_source(
+ app,
+ "failed-only",
+ statuses=(
+ SentWebmentionStatus.SENT,
+ SentWebmentionStatus.FAILED,
+ SentWebmentionStatus.NO_ENDPOINT,
+ None,
+ SentWebmentionStatus.FAILED,
+ ),
+ )
+ other_source = make_source(
+ app, "other-failures", statuses=(SentWebmentionStatus.FAILED,)
+ )
+ with app.app_context():
+ source_mentions = db.session.scalars(
+ sa.select(SentWebmention)
+ .where(SentWebmention.source_uuid == source_id)
+ .order_by(SentWebmention.target)
+ ).all()
+ # An already scheduled retry is still a failed Webmention and should
+ # be reopened; preserve all untouched delivery states exactly.
+ source_mentions[-1].attempt_count = 3
+ source_mentions[-1].next_retry_at = datetime(2026, 11, 30, tzinfo=UTC)
+ db.session.commit()
+ failed_ids = {
+ mention.uuid
+ for mention in source_mentions
+ if mention.status == SentWebmentionStatus.FAILED
+ }
+ untouched_before = {
+ mention.uuid: (
+ mention.status,
+ mention.processed_revision,
+ mention.attempt_count,
+ mention.next_retry_at,
+ )
+ for mention in db.session.scalars(sa.select(SentWebmention))
+ if mention.uuid not in failed_ids
+ }
+ assert len(failed_ids) == 2
+
+ mock_admin_action_form(sent_module, monkeypatch, valid=True)
+ send = Mock()
+ monkeypatch.setattr(sent_module, "send_webmention", send)
+ response = client.post(
+ f"/sent/{source_id}/resend-failed",
+ query_string={
+ "status": "failing",
+ "q": "nothing-matches",
+ "source_page": 2,
+ "page": 3,
+ "history_page": 4,
+ },
+ )
+ assert response.status_code == HTTPStatus.FOUND
+ assert urlsplit(response.headers["Location"]).path == f"/sent/{source_id}"
+ assert parse_qs(urlsplit(response.headers["Location"]).query) == {
+ "status": ["failing"],
+ "q": ["nothing-matches"],
+ "source_page": ["2"],
+ "page": ["3"],
+ "history_page": ["4"],
+ }
+ assert {call.args[0] for call in send.call_args_list} == failed_ids
+ assert send.call_count == 2
+ with app.app_context():
+ mentions = db.session.scalars(sa.select(SentWebmention)).all()
+ for mention in mentions:
+ if mention.uuid in failed_ids:
+ assert mention.status is None
+ assert mention.processed_revision is None
+ assert mention.attempt_count == 0
+ assert mention.next_retry_at is None
+ else:
+ assert (
+ mention.status,
+ mention.processed_revision,
+ mention.attempt_count,
+ mention.next_retry_at,
+ ) == untouched_before[mention.uuid]
+ assert any(m.source_uuid == other_source for m in mentions)
+ events = db.session.scalars(sa.select(SentWebmentionStatusEvent)).all()
+ assert {event.webmention_uuid for event in events} == failed_ids
+ assert all(
+ event.action == "Manually queued for resend (bulk)" for event in events
+ )
+
+
+def test_source_resend_all_failed_with_no_failures_queues_nothing(
+ app: Flask,
+ client: FlaskClient,
+ sent_module: ModuleType,
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ log_in(app, client)
+ source_id = make_source(app, "all-ok", statuses=(SentWebmentionStatus.SENT, None))
+ mock_admin_action_form(sent_module, monkeypatch, valid=True)
+ send = Mock()
+ monkeypatch.setattr(sent_module, "send_webmention", send)
+ # Do not follow the redirect: ConfirmActionForm is mocked for the POST,
+ # and the destination GET needs a real iterable form to render.
+ response = client.post(f"/sent/{source_id}/resend-failed")
+ assert response.status_code == HTTPStatus.FOUND
+ assert urlsplit(response.headers["Location"]).path == f"/sent/{source_id}"
+ with client.session_transaction() as session:
+ assert ("success", "0 failed Webmentions queued for resend.") in session.get(
+ "_flashes", []
+ )
+ send.assert_not_called()
+ with app.app_context():
+ count = db.session.scalar(
+ sa.select(sa.func.count(SentWebmentionStatusEvent.id))
+ )
+ assert count == 0
+
+
+def test_source_resend_all_failed_rejects_invalid_form_and_unknown_source(
+ app: Flask,
+ client: FlaskClient,
+ sent_module: ModuleType,
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ log_in(app, client)
+ source_id = make_source(
+ app, "failed-protected", statuses=(SentWebmentionStatus.FAILED,)
+ )
+ form = mock_admin_action_form(sent_module, monkeypatch, valid=False)
+ send = Mock()
+ monkeypatch.setattr(sent_module, "send_webmention", send)
+ assert client.post(f"/sent/{source_id}/resend-failed").status_code == (
+ HTTPStatus.BAD_REQUEST
+ )
+ form.validate_on_submit.assert_called_once_with()
+ mock_admin_action_form(sent_module, monkeypatch, valid=True)
+ assert client.post(f"/sent/{uuid.uuid7()}/resend-failed").status_code == (
+ HTTPStatus.NOT_FOUND
+ )
+ with app.app_context():
+ mention = db.session.scalar(sa.select(SentWebmention))
+ assert mention is not None and mention.status == SentWebmentionStatus.FAILED
+ count = db.session.scalar(
+ sa.select(sa.func.count(SentWebmentionStatusEvent.id))
+ )
+ assert count == 0
+ send.assert_not_called()
+
+
def test_source_resend_all_includes_successful_and_pending_but_only_this_source(
app: Flask,
client: FlaskClient,
@@ -915,28 +1136,31 @@ def test_sent_source_history_is_paginated_independently_of_webmentions(
log_in(app, client)
source_id, mention_id = create_resendable_sent_webmention(app)
with app.app_context():
+ source = db.session.get(SourceDocument, source_id)
mention = db.session.get(SentWebmention, mention_id)
- assert mention is not None
+ assert source is not None and mention is not None
for n in range(27):
- mention.record_status_event(f"Historical delivery {n}")
+ source.record_event(f"Source revision {n}")
+ mention.record_status_event("Unrelated delivery")
db.session.commit()
first_page = client.get(f"/sent/{source_id}")
assert first_page.status_code == HTTPStatus.OK
soup = BeautifulSoup(first_page.get_data(as_text=True), "html.parser")
- history = soup.select("#status-history-heading ~ ol li")
+ history = soup.select("#source-history-heading ~ ol li")
assert len(history) == 25
- assert "Historical delivery 26" in history[0].get_text()
- assert "Historical delivery 0" not in first_page.get_data(as_text=True)
- links = [_href(link) for link in soup.select("#status-history-heading ~ div a")]
+ assert "Source revision 26" in history[0].get_text()
+ assert "Source revision 0" not in first_page.get_data(as_text=True)
+ assert "Unrelated delivery" not in first_page.get_data(as_text=True)
+ links = [_href(link) for link in soup.select("#source-history-heading ~ div a")]
assert any("history_page=2" in link for link in links)
second_page = client.get(f"/sent/{source_id}?history_page=2")
assert second_page.status_code == HTTPStatus.OK
soup = BeautifulSoup(second_page.get_data(as_text=True), "html.parser")
- history = soup.select("#status-history-heading ~ ol li")
+ history = soup.select("#source-history-heading ~ ol li")
assert len(history) == 2
- assert "Historical delivery 0" in history[-1].get_text()
+ assert "Source revision 0" in history[-1].get_text()
assert len(soup.select("section table tbody tr")) == 1
@@ -947,8 +1171,7 @@ def test_sent_source_history_links_keep_webmentions_page(
source_id, mention_id = create_resendable_sent_webmention(app)
with app.app_context():
source = db.session.get(SourceDocument, source_id)
- mention = db.session.get(SentWebmention, mention_id)
- assert source is not None and mention is not None
+ assert source is not None
source.sent_webmentions.extend(
SentWebmention(
target=f"https://example.org/extra/{number}",
@@ -958,7 +1181,7 @@ def test_sent_source_history_links_keep_webmentions_page(
for number in range(25)
)
for number in range(27):
- mention.record_status_event(f"History event {number}")
+ source.record_event(f"Source event {number}")
db.session.commit()
response = client.get(f"/sent/{source_id}?page=2&source_page=3")
@@ -966,13 +1189,11 @@ def test_sent_source_history_links_keep_webmentions_page(
soup = BeautifulSoup(response.get_data(as_text=True), "html.parser")
history_links = [
(_href(link), parse_qs(urlsplit(_href(link)).query))
- for link in soup.select("#status-history-heading ~ div a")
+ for link in soup.select("#source-history-heading ~ div a")
if urlsplit(_href(link)).path == f"/sent/{source_id}"
]
next_history = next(
- href
- for href, query in history_links
- if query.get("history_page") == ["2"]
+ href for href, query in history_links if query.get("history_page") == ["2"]
)
query = parse_qs(urlsplit(next_history).query)
assert query["page"] == ["2"]
@@ -981,7 +1202,7 @@ def test_sent_source_history_links_keep_webmentions_page(
following = client.get(next_history)
assert following.status_code == HTTPStatus.OK
next_soup = BeautifulSoup(following.get_data(as_text=True), "html.parser")
- assert len(next_soup.select("#status-history-heading ~ ol li")) == 2
+ assert len(next_soup.select("#source-history-heading ~ ol li")) == 2
assert len(next_soup.select("section table tbody tr")) == 1
@@ -991,7 +1212,14 @@ def test_sent_source_explains_current_failed_delivery(
log_in(app, client)
identifier = create_sent_source(app)
- response = client.get(f"/sent/{identifier}")
+ with app.app_context():
+ mention_id = db.session.scalar(
+ sa.select(SentWebmention.uuid).where(
+ SentWebmention.source_uuid == identifier,
+ SentWebmention.status == SentWebmentionStatus.FAILED,
+ )
+ )
+ response = client.get(f"/sent/{identifier}/{mention_id}")
assert response.status_code == HTTPStatus.OK
soup = BeautifulSoup(response.get_data(as_text=True), "html.parser")
@@ -1001,8 +1229,7 @@ def test_sent_source_explains_current_failed_delivery(
reason = soup.find("details")
assert reason is not None
assert "Webmention endpoint returned HTTP 400" in reason.get_text()
- # Keep the existing target table and its resend action.
- assert soup.select_one(".table-responsive table tbody tr button[data-action]")
+ assert soup.select_one('button[data-action*="resend"]')
def test_sent_source_explains_historical_failures_and_escapes_raw_reason(
@@ -1039,9 +1266,10 @@ def test_sent_source_explains_historical_failures_and_escapes_raw_reason(
),
]
)
+ mention_id = mention.uuid
db.session.commit()
- response = client.get(f"/sent/{identifier}")
+ response = client.get(f"/sent/{identifier}/{mention_id}")
assert response.status_code == HTTPStatus.OK
html = response.get_data(as_text=True)
@@ -1056,7 +1284,7 @@ def test_sent_source_explains_historical_failures_and_escapes_raw_reason(
assert "&lt;script&gt;" in html
-def test_sent_source_explains_no_endpoint_without_suggesting_remote_edits(
+def test_sent_webmention_explains_no_endpoint_without_suggesting_remote_edits(
app: Flask, client: FlaskClient
) -> None:
log_in(app, client)
@@ -1068,18 +1296,150 @@ def test_sent_source_explains_no_endpoint_without_suggesting_remote_edits(
assert mention is not None
mention.status = SentWebmentionStatus.NO_ENDPOINT
mention.failure_reason = "No Webmention endpoint discovered"
+ mention_id = mention.uuid
db.session.commit()
- response = client.get(f"/sent/{identifier}")
+ response = client.get(f"/sent/{identifier}/{mention_id}")
assert response.status_code == HTTPStatus.OK
soup = BeautifulSoup(response.get_data(as_text=True), "html.parser")
assert "does not advertise a usable Webmention endpoint" in soup.get_text()
assert "No Webmention endpoint discovered" in soup.get_text()
- # The unrelated failed mention may have guidance; the no-endpoint row must not.
- no_endpoint_row = next(
- row
- for row in soup.select(".table-responsive table tbody tr")
- if "No Webmention endpoint discovered" in row.get_text()
+ assert "Suggested next step:" not in soup.get_text()
+
+
+def test_sent_webmention_detail_is_scoped_to_one_target(
+ app: Flask, client: FlaskClient
+) -> None:
+ log_in(app, client)
+ source_id = create_sent_source(app)
+ with app.app_context():
+ mentions = db.session.scalars(
+ sa.select(SentWebmention)
+ .where(SentWebmention.source_uuid == source_id)
+ .order_by(SentWebmention.target)
+ ).all()
+ assert len(mentions) == 2
+ first, second = mentions
+ first.record_status_event("First target delivery")
+ second.record_status_event("Other target delivery")
+ first_id = first.uuid
+ second_id = second.uuid
+ db.session.commit()
+
+ response = client.get(f"/sent/{source_id}/{first_id}")
+ assert response.status_code == HTTPStatus.OK
+ soup = BeautifulSoup(response.get_data(as_text=True), "html.parser")
+ history = soup.select("#status-history-heading ~ ol li")
+ assert len(history) == 1
+ assert "First target delivery" in history[0].get_text()
+ assert "Other target delivery" not in soup.get_text()
+ assert f"/sent/{source_id}/{second_id}" not in response.get_data(as_text=True)
+
+
+def test_sent_webmention_detail_rejects_other_sources_and_missing_targets(
+ app: Flask, client: FlaskClient
+) -> None:
+ log_in(app, client)
+ source_id, mention_id = create_resendable_sent_webmention(app)
+ other_id = create_sent_source(app)
+ assert (
+ client.get(f"/sent/{other_id}/{mention_id}").status_code == HTTPStatus.NOT_FOUND
+ )
+ assert (
+ client.get(f"/sent/{source_id}/{uuid.uuid7()}").status_code
+ == HTTPStatus.NOT_FOUND
+ )
+
+
+def test_sent_webmention_history_is_paginated_and_preserves_source_page(
+ app: Flask, client: FlaskClient
+) -> None:
+ log_in(app, client)
+ source_id, mention_id = create_resendable_sent_webmention(app)
+ with app.app_context():
+ mention = db.session.get(SentWebmention, mention_id)
+ assert mention is not None
+ for n in range(27):
+ mention.record_status_event(f"Delivery attempt {n}")
+ db.session.commit()
+
+ response = client.get(f"/sent/{source_id}/{mention_id}?page=3&source_page=2")
+ assert response.status_code == HTTPStatus.OK
+ soup = BeautifulSoup(response.get_data(as_text=True), "html.parser")
+ assert len(soup.select("#status-history-heading ~ ol li")) == 25
+ assert "Delivery attempt 26" in soup.get_text()
+ links = [_href(a) for a in soup.select("#status-history-heading ~ div a")]
+ second_page = next(link for link in links if "history_page=2" in link)
+ query = parse_qs(urlsplit(second_page).query)
+ assert query["source_page"] == ["2"]
+ assert query["page"] == ["3"]
+ assert "Delivery attempt 0" not in soup.get_text()
+
+ response = client.get(second_page)
+ assert response.status_code == HTTPStatus.OK
+ soup = BeautifulSoup(response.get_data(as_text=True), "html.parser")
+ assert len(soup.select("#status-history-heading ~ ol li")) == 2
+ assert "Delivery attempt 0" in soup.get_text()
+ back = soup.select_one('a[href*="/sent/"]')
+ assert back is not None
+ assert urlsplit(_href(back)).path == f"/sent/{source_id}"
+ assert parse_qs(urlsplit(_href(back)).query) == {
+ "source_page": ["2"],
+ "page": ["3"],
+ }
+
+
+def test_resend_from_sent_webmention_detail_returns_to_detail(
+ app: Flask,
+ client: FlaskClient,
+ sent_module: ModuleType,
+ monkeypatch: pytest.MonkeyPatch,
+) -> None:
+ log_in(app, client)
+ source_id, mention_id = create_resendable_sent_webmention(app)
+ mock_admin_action_form(sent_module, monkeypatch, valid=True)
+ send = Mock()
+ monkeypatch.setattr(sent_module, "send_webmention", send)
+
+ response = client.post(
+ f"/sent/{source_id}/{mention_id}/resend",
+ query_string={
+ "return_to": "detail",
+ "source_page": 2,
+ "page": 3,
+ "history_page": 4,
+ "q": "resend",
+ },
+ )
+ assert response.status_code == HTTPStatus.FOUND
+ assert urlsplit(response.headers["Location"]).path == (
+ f"/sent/{source_id}/{mention_id}"
)
- assert "Suggested next step:" not in no_endpoint_row.get_text()
+ assert parse_qs(urlsplit(response.headers["Location"]).query) == {
+ "source_page": ["2"],
+ "page": ["3"],
+ "history_page": ["4"],
+ "q": ["resend"],
+ }
+ send.assert_called_once_with(mention_id)
+
+
+def test_source_history_does_not_include_other_source_lifecycle_events(
+ app: Flask, client: FlaskClient
+) -> None:
+ log_in(app, client)
+ source_id = create_sent_source(app)
+ other_id = make_source(app, "other-history", statuses=())
+ with app.app_context():
+ source = db.session.get(SourceDocument, source_id)
+ other = db.session.get(SourceDocument, other_id)
+ assert source is not None and other is not None
+ source.record_event("Source discovered")
+ other.record_event("Another source deleted")
+ db.session.commit()
+
+ response = client.get(f"/sent/{source_id}")
+ assert response.status_code == HTTPStatus.OK
+ assert "Source discovered" in response.get_data(as_text=True)
+ assert "Another source deleted" not in response.get_data(as_text=True)