aboutsummaryrefslogtreecommitdiff
path: root/tests/views
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--tests/views/helpers.py32
-rw-r--r--tests/views/test_admin.py4
-rw-r--r--tests/views/test_endpoint.py4
3 files changed, 21 insertions, 19 deletions
diff --git a/tests/views/helpers.py b/tests/views/helpers.py
index 2da2ace..3c74a1b 100644
--- a/tests/views/helpers.py
+++ b/tests/views/helpers.py
@@ -17,7 +17,7 @@ from webmentions_ssg.models import (
ReceivedWebmention,
SentWebmention,
SentWebmentionStatus,
- Source,
+ SourceDocument,
User,
)
@@ -64,7 +64,7 @@ def create_sent_source(app: Flask) -> uuid.UUID:
now = datetime.now(UTC)
with app.app_context():
- source = Source(
+ source = SourceDocument(
path="blog/example/index.html",
url="https://dennisfink.me/blog/example/",
content_hash="0" * 32,
@@ -77,24 +77,24 @@ def create_sent_source(app: Flask) -> uuid.UUID:
[
SentWebmention(
target="https://example.com/b",
- active=True,
+ linked=True,
desired_revision=2,
processed_revision=2,
sent_revision=2,
status=SentWebmentionStatus.SENT,
- endpoint="https://example.com/webmention",
- response_status=HTTPStatus.ACCEPTED,
+ webmention_endpoint="https://example.com/webmention",
+ endpoint_response_status=HTTPStatus.ACCEPTED,
),
SentWebmention(
target="https://example.com/a",
- active=True,
+ linked=True,
desired_revision=2,
processed_revision=2,
sent_revision=1,
status=SentWebmentionStatus.FAILED,
failure_reason="Webmention endpoint returned HTTP 400",
- endpoint="https://example.com/webmention",
- response_status=HTTPStatus.BAD_REQUEST,
+ webmention_endpoint="https://example.com/webmention",
+ endpoint_response_status=HTTPStatus.BAD_REQUEST,
),
]
)
@@ -161,7 +161,7 @@ def create_resendable_sent_webmention(app: Flask) -> tuple[uuid.UUID, uuid.UUID]
now = datetime.now(UTC)
with app.app_context():
- source = Source(
+ source = SourceDocument(
path="blog/resend/index.html",
url="https://dennisfink.me/blog/resend/",
content_hash="1" * 32,
@@ -171,14 +171,14 @@ def create_resendable_sent_webmention(app: Flask) -> tuple[uuid.UUID, uuid.UUID]
)
webmention = SentWebmention(
target="https://example.com/resend",
- active=True,
+ linked=True,
desired_revision=3,
processed_revision=3,
sent_revision=2,
status=SentWebmentionStatus.FAILED,
failure_reason="Previous failure",
- endpoint="https://example.com/webmention",
- response_status=HTTPStatus.INTERNAL_SERVER_ERROR,
+ webmention_endpoint="https://example.com/webmention",
+ endpoint_response_status=HTTPStatus.INTERNAL_SERVER_ERROR,
status_url="https://example.com/webmention/status/123",
)
source.sent_webmentions.append(webmention)
@@ -194,7 +194,7 @@ def create_outgoing(
) -> tuple[uuid.UUID, uuid.UUID]:
now = datetime.now(UTC)
with app.app_context():
- source = Source(
+ source = SourceDocument(
path="blog/post/index.html",
url="https://source.example/blog/post",
content_hash="0" * 32,
@@ -204,10 +204,12 @@ def create_outgoing(
)
mention = SentWebmention(
target="https://example.com/article",
- active=True,
+ linked=True,
desired_revision=1,
status_url=status_url,
- response_status=HTTPStatus.CREATED if status_url is not None else None,
+ endpoint_response_status=(
+ HTTPStatus.CREATED if status_url is not None else None
+ ),
)
source.sent_webmentions.append(mention)
db.session.add(source)
diff --git a/tests/views/test_admin.py b/tests/views/test_admin.py
index 90d406b..fa5575b 100644
--- a/tests/views/test_admin.py
+++ b/tests/views/test_admin.py
@@ -331,8 +331,8 @@ def test_resend_sent_webmention_reopens_current_revision(
assert webmention.sent_revision == 2
assert webmention.status is None
assert webmention.failure_reason is None
- assert webmention.endpoint is None
- assert webmention.response_status is None
+ assert webmention.webmention_endpoint is None
+ assert webmention.endpoint_response_status is None
assert webmention.status_url is None
send_webmention.assert_called_once_with(webmention_identifier)
diff --git a/tests/views/test_endpoint.py b/tests/views/test_endpoint.py
index 52ef77d..88b665f 100644
--- a/tests/views/test_endpoint.py
+++ b/tests/views/test_endpoint.py
@@ -253,11 +253,11 @@ def test_endpoint_rejects_digest_collision(
)
db.session.add(existing)
db.session.commit()
- digest = existing.url_digest
+ digest = existing.source_target_digest
form.source.data = "https://source.example/different"
monkeypatch.setattr(
- views_module, "received_url_digest", lambda source, target: digest
+ views_module, "source_target_digest", lambda source, target: digest
)
response = client.post("/endpoint")