Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Improve the tests for relations #12113

Merged
merged 9 commits into from
Mar 2, 2022
Prev Previous commit
Reuse the parent event for a test.
clokep committed Mar 1, 2022
commit e23dfa57e6ec8e659f43e4d836fae79bed6eab0f
13 changes: 5 additions & 8 deletions tests/rest/client/test_relations.py
Original file line number Diff line number Diff line change
@@ -1390,15 +1390,11 @@ def test_redact_relation_edit(self) -> None:
"""Test that edits of an event are redacted when the original event
is redacted.
"""
# Send a new event
res = self.helper.send(self.room, body="Heyo!", tok=self.user_token)
original_event_id = res["event_id"]

# Add a relation
channel = self._send_relation(
RelationTypes.REPLACE,
"m.room.message",
parent_id=original_event_id,
parent_id=self.parent_id,
content={
"msgtype": "m.text",
"body": "Wibble",
@@ -1411,7 +1407,7 @@ def test_redact_relation_edit(self) -> None:
channel = self.make_request(
"GET",
f"/_matrix/client/unstable/rooms/{self.room}/relations"
f"/{original_event_id}/m.replace/m.room.message",
f"/{self.parent_id}/m.replace/m.room.message",
access_token=self.user_token,
)
self.assertEqual(200, channel.code, channel.json_body)
@@ -1420,12 +1416,13 @@ def test_redact_relation_edit(self) -> None:
self.assertEqual(len(channel.json_body["chunk"]), 1)

# Redact the original event
self._redact(original_event_id)
self._redact(self.parent_id)

# Try to check for remaining m.replace relations
channel = self.make_request(
"GET",
f"/_matrix/client/unstable/rooms/{self.room}/relations/{original_event_id}/m.replace/m.room.message",
f"/_matrix/client/unstable/rooms/{self.room}/relations"
f"/{self.parent_id}/m.replace/m.room.message",
access_token=self.user_token,
)
self.assertEqual(200, channel.code, channel.json_body)