From fc89e742693cb7bd71c6a84ca6447d7e769e6316 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 28 Jan 2020 15:43:57 +0000
Subject: [PATCH] Add support for experimental MSC2260 room version

---
 lib/SyTest/Federation/Client.pm              | 5 ++++-
 tests/50federation/50server-acl-endpoints.pl | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/SyTest/Federation/Client.pm b/lib/SyTest/Federation/Client.pm
index 7995f2d12..55644e82d 100644
--- a/lib/SyTest/Federation/Client.pm
+++ b/lib/SyTest/Federation/Client.pm
@@ -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
 {
diff --git a/tests/50federation/50server-acl-endpoints.pl b/tests/50federation/50server-acl-endpoints.pl
index 734c78156..c8ef3eea6 100644
--- a/tests/50federation/50server-acl-endpoints.pl
+++ b/tests/50federation/50server-acl-endpoints.pl
@@ -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 ],
@@ -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",
    );
 }