Fixes/changes for federated invitation tests #494
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
S7evinK
added a commit
to matrix-org/dendrite
that referenced
this pull request
Oct 7, 2022
Fixes #2121, test added in matrix-org/complement#494
S7evinK
changed the title
DMRobertson
reviewed
Oct 14, 2022
| alice.InviteRoom(t, roomID, bob.UserID) | ||
| charlieSince := bob.MustSyncUntil(t, client.SyncReq{}, client.SyncInvitedTo(bob.UserID, roomID)) |
There was a problem hiding this comment.
not sure what charlieSince was here. A typo?
There was a problem hiding this comment.
More or less, probably had a Charlie before and forgot to rename the variable. :)
Comment on lines
-91
to
+94
| eventContent := event.Get("content." + field).Str | ||
| wantValue := wantValues[eventType] | ||
| eventStateKey := event.Get("state_key").Str | ||
|
|
||
| res := cl.MustDoFunc(t, "GET", []string{"_matrix", "client", "v3", "rooms", roomID, "state", eventType, eventStateKey}) | ||
|
|
||
| must.MatchResponse(t, res, match.HTTPResponse{ | ||
| JSON: []match.JSON{ | ||
| match.JSONKeyEqual(field, eventContent), | ||
| match.JSONKeyEqual(field, wantValue), |
Comment on lines
96
to
100
| queryParams := url.Values{} | ||
| queryParams.Set("format", "event") | ||
| bob.MustSyncUntil(t, client.SyncReq{}, client.SyncJoinedTo(bob.UserID, roomID)) | ||
| // now get the direct flag from the membership event | ||
| res := bob.MustDoFunc(t, "GET", []string{"_matrix", "client", "v3", "rooms", roomID, "state", "m.room.member", bob.UserID}, client.WithQueries(queryParams)) |
There was a problem hiding this comment.
What's going on with the query parameters? I can't see them mentioned in the spec. It does seem to correspond to this sytest though.
Isn't Bob's membership event visible in the sync result anyway---do we need to make this request?
There was a problem hiding this comment.
Oh, this is apparently unspecced but desired in the spec:
There was a problem hiding this comment.
Fair enough, updated to check the sync response instead.
DMRobertson
approved these changes
Oct 14, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes a bug in
verifyStatewhere we'd compare the expected content with the event itself..Adds a test that
is_directis set inunsigned.prev_content, as clients otherwise might not be able to distinguish between DMs and normal rooms.