Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for experimental MSC2260 room version #790

Merged
merged 2 commits into from
Jan 28, 2020
Merged

Add support for experimental MSC2260 room version #790

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc89e74
Add support for experimental MSC2260 room version
richvdh Jan 28, 2020
b87f824
Merge remote-tracking branch 'origin/develop' into rav/msc2260
richvdh Jan 28, 2020
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
5 changes: 4 additions & 1 deletion lib/SyTest/Federation/Client.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ use SyTest::Assertions qw( :all );

use URI::Escape qw( uri_escape );

use constant SUPPORTED_ROOM_VERSIONS => [1, 2, 3, 4, 5];
use constant SUPPORTED_ROOM_VERSIONS => [qw(
1 2 3 4 5
org.matrix.msc2260
)];

sub configure
{
Expand Down
4 changes: 3 additions & 1 deletion tests/50federation/50server-acl-endpoints.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# the test routines should behave as similarly as they can for the expect_ban
# case and the control case.

use SyTest::Federation::Client;

my @TESTS = (
[ "send events", *can_send_event ],
[ "/make_join", *can_make_join ],
Expand Down Expand Up @@ -72,7 +74,7 @@ sub can_make_join {
method => "GET",
hostname => $params{dest_server},
uri => "/v1/make_join/$room_id/$sytest_user_id",
params => { "ver" => [1, 2, 3, 4, 5] },
params => { "ver" => SyTest::Federation::Client::SUPPORTED_ROOM_VERSIONS, },
), $params{expect_ban}, "/make_join",
);
}
Expand Down