From 4a56be36196cdb062b63f3237608b2b5ca3ecc34 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Jun 2024 11:22:56 +0100 Subject: [PATCH 1/3] Move MSC4115 test to man CSAPI suite This is stable now. --- .../membership_on_events_test.go} | 8 ++++---- tests/msc4115/main_test.go | 11 ----------- 2 files changed, 4 insertions(+), 15 deletions(-) rename tests/{msc4115/msc4115_test.go => csapi/membership_on_events_test.go} (91%) delete mode 100644 tests/msc4115/main_test.go diff --git a/tests/msc4115/msc4115_test.go b/tests/csapi/membership_on_events_test.go similarity index 91% rename from tests/msc4115/msc4115_test.go rename to tests/csapi/membership_on_events_test.go index 4f5bb852..b31433f2 100644 --- a/tests/msc4115/msc4115_test.go +++ b/tests/csapi/membership_on_events_test.go @@ -1,4 +1,4 @@ -package tests +package csapi_tests import ( "github.com/matrix-org/complement/b" @@ -10,11 +10,11 @@ import ( "github.com/matrix-org/complement/helpers" ) -// MSC4115: membership information on events +// Membership information on events served to clients, as specified in MSC4115. // -// Alice sends one message before bob joins, then one after. Bob reads both messages, and checks the membership state +// Alice sends one message before Vob joins, then one after. Bob reads both messages, and checks the membership state // on each. -func TestMSC4115(t *testing.T) { +func TestMembershipOnEvents(t *testing.T) { runtime.SkipIf(t, runtime.Dendrite) // not yet implemented deployment := complement.Deploy(t, 1) diff --git a/tests/msc4115/main_test.go b/tests/msc4115/main_test.go deleted file mode 100644 index edb9d0f0..00000000 --- a/tests/msc4115/main_test.go +++ /dev/null @@ -1,11 +0,0 @@ -package tests - -import ( - "testing" - - "github.com/matrix-org/complement" -) - -func TestMain(m *testing.M) { - complement.TestMain(m, "msc4115") -} From 878c77cef6f6539bb881b933003648fc369158ab Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Jun 2024 11:23:39 +0100 Subject: [PATCH 2/3] Switch membership property to stable identifier --- tests/csapi/membership_on_events_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/csapi/membership_on_events_test.go b/tests/csapi/membership_on_events_test.go index b31433f2..90096764 100644 --- a/tests/csapi/membership_on_events_test.go +++ b/tests/csapi/membership_on_events_test.go @@ -52,7 +52,7 @@ func TestMembershipOnEvents(t *testing.T) { if ev.Get("type").Str == "m.room.member" && ev.Get("state_key").Str == bob.UserID { haveSeenJoin = true } - membership := ev.Get("unsigned." + client.GjsonEscape("io.element.msc4115.membership")).Str + membership := ev.Get("unsigned.membership").Str expectedMembership := "leave" if haveSeenJoin { expectedMembership = "join" From 02db022d38804828def1cede205347d522cf3aec Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Wed, 12 Jun 2024 22:36:46 +0100 Subject: [PATCH 3/3] Update tests/csapi/membership_on_events_test.go --- tests/csapi/membership_on_events_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/csapi/membership_on_events_test.go b/tests/csapi/membership_on_events_test.go index 90096764..c3291ab5 100644 --- a/tests/csapi/membership_on_events_test.go +++ b/tests/csapi/membership_on_events_test.go @@ -12,7 +12,7 @@ import ( // Membership information on events served to clients, as specified in MSC4115. // -// Alice sends one message before Vob joins, then one after. Bob reads both messages, and checks the membership state +// Alice sends one message before Bob joins, then one after. Bob reads both messages, and checks the membership state // on each. func TestMembershipOnEvents(t *testing.T) { runtime.SkipIf(t, runtime.Dendrite) // not yet implemented