Convert more tests to Complement #353
Conversation
| defer func() { | ||
| // sytest: Both GET and PUT work | ||
| if successCount != 2 { | ||
| t.Fatalf("expected GET and PUT to work") |
There was a problem hiding this comment.
Why is this necessary? t.Run("Parallel", ... will block until the tests complete. Each test can fail the subtest which will have a knock-on effect and fail the outer test, so this seems entirely redundant? We never do this anywhere in Complement AFAICT.
|
|
||
| powerLevels := gjson.ParseBytes(must.ParseJSON(t, res.Body)) | ||
| changedUser := client.GjsonEscape("@random-other-user:their.home") | ||
| alicePowerLevel := powerLevels.Get("users." + alice.UserID).Int() |
There was a problem hiding this comment.
Technically alice.UserID should be gjson escaped as well.
| reqBody = client.WithJSONBody(t, map[string]interface{}{}) | ||
| alice.MustDoFunc(t, "PUT", []string{"_matrix", "client", "v3", "rooms", roomID, "state", "m.room.power_levels"}, reqBody) | ||
| // this should now give a 403 (not a 500) | ||
| res := alice.DoFunc(t, "PUT", []string{"_matrix", "client", "v3", "rooms", roomID, "state", "m.room.power_levels"}, reqBody) |
There was a problem hiding this comment.
This isn't what the sytest is doing.
# absence of an 'events' key
matrix_put_room_state(
$user,
$room_id,
type => "m.room.power_levels",
state_key => "",
content => {
users => {
$user->user_id => 100,
},
},
)->then( sub {
# absence of a 'users' key
matrix_put_room_state(
$user,
$room_id,
type => "m.room.power_levels",
state_key => "",
content => {
},
);
})->then( sub {
# this should now give a 403 (not a 500)
matrix_put_room_state(
$user,
$room_id,
type => "m.room.power_levels",
state_key => "",
content => {
users => {},
},
) -> main::expect_http_403;
})So the order is:
- PUT with users key with alice
- PUT with empty content
- PUT with users key present but empty -> 403
| }) | ||
| } | ||
|
|
||
| func joinRoomSynced(t *testing.T, cl *client.CSAPI, roomID, alias string) { |
There was a problem hiding this comment.
These should probably go into the Client impl to be honest. For now leave them here though.
tests/csapi/room_versions_test.go
Outdated
| roomID := createRoomSynced(t, alice, map[string]interface{}{ | ||
| "room_version": roomVersion, | ||
| }) | ||
| alice.MustSyncUntil(t, client.SyncReq{}, client.SyncJoinedTo(alice.UserID, roomID)) |
There was a problem hiding this comment.
Isn't the whole point of the createRoomSynced function to literally do this? Why do it again?
| } | ||
| for typ, joiner := range userTypes { | ||
| typ := typ | ||
| joiner := joiner |
There was a problem hiding this comment.
Need comments to explain why you do this (else it'll take the last value only).
| }) | ||
| charlie.MustSyncUntil(t, client.SyncReq{}, client.SyncInvitedTo(charlie.UserID, roomID)) | ||
| charlie.LeaveRoom(t, roomID) | ||
| }) |
There was a problem hiding this comment.
No check for alice to see that the invite was rejected?
…roomversions # Conflicts: # dockerfiles/synapse/homeserver.yaml # dockerfiles/synapse/workers-shared.yaml # tests/csapi/rooms_state_test.go
|
Closing as stale. |
Again adds new tests:
tests/32room-versions.pl- this seems to slow down the tests quite a bit (at least locally)tests/10apidoc/36room-levels.pltests/30rooms/01state.pl