summary refs log tree commit diff
path: root/tests/rest/client/test_room_access_rules.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-17 16:35:24 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-17 16:35:24 +0000
commitd246c99947cfcb00ff39f40ef78fd5185c977ddc (patch)
treefc06edfe2015a028a3817cdc08060e1142d80fb7 /tests/rest/client/test_room_access_rules.py
parentremove unused and unnecessary check for FederationDeniedError (#5645) (diff)
parentMerge pull request #5638 from matrix-org/babolivier/invite-json (diff)
downloadsynapse-d246c99947cfcb00ff39f40ef78fd5185c977ddc.tar.xz
Merge pull request #5638 from matrix-org/babolivier/invite-json
Diffstat (limited to 'tests/rest/client/test_room_access_rules.py')
-rw-r--r--tests/rest/client/test_room_access_rules.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/rest/client/test_room_access_rules.py b/tests/rest/client/test_room_access_rules.py

index c17b0c226d..d44f5c2c8c 100644 --- a/tests/rest/client/test_room_access_rules.py +++ b/tests/rest/client/test_room_access_rules.py
@@ -21,7 +21,6 @@ import string from mock import Mock from twisted.internet import defer - from synapse.api.constants import EventTypes, JoinRules, RoomCreationPreset from synapse.rest import admin from synapse.rest.client.v1 import login, room @@ -62,7 +61,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase): address_domain = args["address"].split("@")[1] return defer.succeed({"hs": address_domain}) - def post_urlencoded_get_json(uri, args={}, headers=None): + def post_json_get_json(uri, post_json, args={}, headers=None): token = "".join(random.choice(string.ascii_letters) for _ in range(10)) return defer.succeed( { @@ -84,11 +83,13 @@ class RoomAccessTestCase(unittest.HomeserverTestCase): mock_federation_client = Mock(spec=["send_invite"]) mock_federation_client.send_invite.side_effect = send_invite - mock_http_client = Mock(spec=["get_json", "post_urlencoded_get_json"]) + mock_http_client = Mock( + spec=["get_json", "post_json_get_json"], + ) # Mocking the response for /info on the IS API. mock_http_client.get_json.side_effect = get_json # Mocking the response for /store-invite on the IS API. - mock_http_client.post_urlencoded_get_json.side_effect = post_urlencoded_get_json + mock_http_client.post_json_get_json.side_effect = post_json_get_json self.hs = self.setup_test_homeserver( config=config, federation_client=mock_federation_client,