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

Allow specifying the application service-specific user_id parameter in the join test helper. #11616

Merged
merged 7 commits into from
Feb 3, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/11616.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow specifying the application service-specific `user_id` parameter in the `join` test helper.
clokep marked this conversation as resolved.
Show resolved Hide resolved
22 changes: 20 additions & 2 deletions tests/rest/client/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,20 @@ def invite(self, room=None, src=None, targ=None, expect_code=200, tok=None):
expect_code=expect_code,
)

def join(self, room=None, user=None, expect_code=200, tok=None):
def join(
self,
room=None,
user=None,
expect_code=200,
tok=None,
reivilibre marked this conversation as resolved.
Show resolved Hide resolved
appservice_user_id: Optional[str] = None,
):
self.change_membership(
room=room,
src=user,
targ=user,
tok=tok,
appservice_user_id=appservice_user_id,
membership=Membership.JOIN,
expect_code=expect_code,
)
Expand Down Expand Up @@ -204,6 +212,7 @@ def change_membership(
membership: str,
extra_data: Optional[dict] = None,
tok: Optional[str] = None,
appservice_user_id: Optional[str] = None,
expect_code: int = 200,
expect_errcode: Optional[str] = None,
) -> None:
Expand All @@ -217,15 +226,24 @@ def change_membership(
membership: The type of membership event
extra_data: Extra information to include in the content of the event
tok: The user access token to use
appservice_user_id: The `user_id` URL parameter to pass.
This allows driving an application service user
using an application service access token in `tok`.
expect_code: The expected HTTP response code
expect_errcode: The expected Matrix error code
"""
temp_id = self.auth_user_id
self.auth_user_id = src

path = "/_matrix/client/r0/rooms/%s/state/m.room.member/%s" % (room, targ)
next_arg_char = "?"

if tok:
path = path + "?access_token=%s" % tok
path += "?access_token=%s" % tok
next_arg_char = "&"

if appservice_user_id:
path += f"{next_arg_char}user_id={appservice_user_id}"
reivilibre marked this conversation as resolved.
Show resolved Hide resolved

data = {"membership": membership}
data.update(extra_data or {})
Expand Down