Skip to content

Test against stable MSC1772 spaces identifiers #107

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

Merged
clokep merged 3 commits into from
May 17, 2021
+5 −9
Merged

Test against stable MSC1772 spaces identifiers #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97146f7
Switch to the stable space endpoint.
clokep Apr 30, 2021
cfbe873
Merge remote-tracking branch 'origin/master' into clokep/stable-spaces
clokep May 10, 2021
a21ce83
Merge remote-tracking branch 'origin/master' into clokep/stable-spaces
clokep May 17, 2021
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
8 changes: 4 additions & 4 deletions tests/msc2946_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
)

var (
spaceChildEventType = "org.matrix.msc1772.space.child"
spaceParentEventType = "org.matrix.msc1772.space.parent"
spaceChildEventType = "m.space.child"
spaceParentEventType = "m.space.parent"
)

// the API doesn't return event IDs so we need to key off the
Expand Down Expand Up @@ -72,7 +72,7 @@ func TestClientSpacesSummary(t *testing.T) {
"name": "Sub-Space 1",
"topic": "Some topic for sub-space 1",
"creation_content": map[string]interface{}{
"org.matrix.msc1772.type": "org.matrix.msc1772.space",
"type": "m.space",
},
})
roomNames[ss1] = "Sub-Space 1"
Expand Down Expand Up @@ -185,7 +185,7 @@ func TestClientSpacesSummary(t *testing.T) {
}
}
if roomID == ss1 {
wantType := "org.matrix.msc1772.space"
wantType := "m.space"
if data.Get("room_type").Str != wantType {
return fmt.Errorf("room %s got type %s want %s", roomID, data.Get("room_type").Str, wantType)
}
Expand Down
6 changes: 1 addition & 5 deletions tests/msc3083_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ import (
"github.com/matrix-org/complement/internal/docker"
)

var (
msc1772SpaceChildEventType = "org.matrix.msc1772.space.child"
)

func FailJoinRoom(c *client.CSAPI, t *testing.T, roomIDOrAlias string, serverName string) {
// This is copied from Client.JoinRoom to test a join failure.
query := make(url.Values, 1)
Expand Down Expand Up @@ -64,7 +60,7 @@ func SetupRestrictedRoom(t *testing.T, deployment *docker.Deployment) (*client.C
},
})
alice.SendEventSynced(t, space, b.Event{
Type: msc1772SpaceChildEventType,
Type: "m.space.child",
StateKey: &room,
Content: map[string]interface{}{
"via": []string{"hs1"},
Expand Down