summary refs log tree commit diff
path: root/tests/rest/client
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2022-07-29 15:15:21 +0100
committerRichard van der Hoff <richard@matrix.org>2022-07-29 15:15:21 +0100
commitd548d8f18d23d2327c5dd3b4c79d74e900995201 (patch)
tree36401cab940a052c58da5747fa34e083ea98e7ec /tests/rest/client
parentExplicitly mention which resources support compression in the config guide (#... (diff)
parentupdate changelog (diff)
downloadsynapse-d548d8f18d23d2327c5dd3b4c79d74e900995201.tar.xz
Merge tag 'v1.64.0rc2' into develop
Synapse 1.64.0rc2 (2022-07-29)
==============================

This RC reintroduces support for `account_threepid_delegates.email`, which was removed in 1.64.0rc1. It remains deprecated and will be removed altogether in a future release. ([\#13406](https://github.com/matrix-org/synapse/issues/13406))
Diffstat (limited to 'tests/rest/client')
-rw-r--r--tests/rest/client/test_register.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/client/test_register.py b/tests/rest/client/test_register.py
index 071b488cc0..f8e64ce6ac 100644
--- a/tests/rest/client/test_register.py
+++ b/tests/rest/client/test_register.py
@@ -586,9 +586,9 @@ class RegisterRestServletTestCase(unittest.HomeserverTestCase):
                 "require_at_registration": True,
             },
             "account_threepid_delegates": {
+                "email": "https://id_server",
                 "msisdn": "https://id_server",
             },
-            "email": {"notif_from": "Synapse <synapse@example.com>"},
         }
     )
     def test_advertised_flows_captcha_and_terms_and_3pids(self) -> None: