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

Stable support for MSC4115-style membership properties #725

Merged
merged 3 commits into from
Jun 14, 2024
+5 −16
Merged

Stable support for MSC4115-style membership properties #725

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a56be3
Move MSC4115 test to man CSAPI suite
richvdh Jun 7, 2024
878c77c
Switch membership property to stable identifier
richvdh Jun 7, 2024
02db022
Update tests/csapi/membership_on_events_test.go
richvdh Jun 12, 2024
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
10 changes: 5 additions & 5 deletions tests/msc4115/msc4115_test.go → tests/csapi/membership_on_events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tests
package csapi_tests

import (
"github.com/matrix-org/complement/b"
Expand All @@ -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.
richvdh marked this conversation as resolved.
Show resolved Hide resolved
func TestMSC4115(t *testing.T) {
func TestMembershipOnEvents(t *testing.T) {
runtime.SkipIf(t, runtime.Dendrite) // not yet implemented

deployment := complement.Deploy(t, 1)
Expand Down Expand Up @@ -52,7 +52,7 @@ func TestMSC4115(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"
Expand Down
11 changes: 0 additions & 11 deletions tests/msc4115/main_test.go
View file
Open in desktop

This file was deleted.

Loading