Skip to content

Allow search results to appear in multiple orders #479

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
richvdh merged 2 commits into from
Sep 27, 2022
Merged

Allow search results to appear in multiple orders #479

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a98d9e4
Allow search results to appear in multiple orders
richvdh Sep 27, 2022
b0389ab
fix the test
richvdh Sep 27, 2022
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
35 changes: 25 additions & 10 deletions tests/csapi/apidoc_search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,15 @@ func TestSearch(t *testing.T) {
"msgtype": "m.text",
},
})
t.Logf("Sent message before upgrade with event ID %s", eventBeforeUpgrade)

upgradeBody := client.WithJSONBody(t, map[string]string{
"new_version": "9",
})
upgradeResp := alice.MustDoFunc(t, "POST", []string{"_matrix", "client", "v3", "rooms", roomID, "upgrade"}, upgradeBody)
body := must.ParseJSON(t, upgradeResp.Body)
newRoomID := must.GetJSONFieldStr(t, body, "replacement_room")
t.Logf("Replaced room %s with %s", roomID, newRoomID)

eventAfterUpgrade := alice.SendEventSynced(t, newRoomID, b.Event{
Type: "m.room.message",
Expand All @@ -227,6 +229,7 @@ func TestSearch(t *testing.T) {
"msgtype": "m.text",
},
})
t.Logf("Sent message after upgrade with event ID %s", eventAfterUpgrade)

searchRequest := client.WithJSONBody(t, map[string]interface{}{
"search_categories": map[string]interface{}{
Expand All @@ -242,20 +245,32 @@ func TestSearch(t *testing.T) {

resp := alice.MustDoFunc(t, "POST", []string{"_matrix", "client", "v3", "search"}, searchRequest)
sce := "search_categories.room_events"
result0 := sce + ".results.0.result"
result1 := sce + ".results.1.result"

expectedEvents := map[string]string{
eventBeforeUpgrade: "Message before upgrade",
eventAfterUpgrade: "Message after upgrade",
}
must.MatchResponse(t, resp, match.HTTPResponse{
StatusCode: http.StatusOK,
JSON: []match.JSON{
match.JSONKeyPresent(sce + ".count"),
match.JSONKeyPresent(sce + ".results"),
match.JSONKeyEqual(sce+".count", float64(2)),
match.JSONKeyPresent(result0 + ".content"),
match.JSONKeyPresent(result0 + ".type"),
match.JSONKeyEqual(result0+".event_id", eventBeforeUpgrade),
match.JSONKeyEqual(result1+".event_id", eventAfterUpgrade),
match.JSONKeyEqual(result0+".content.body", "Message before upgrade"),
match.JSONKeyEqual(result1+".content.body", "Message after upgrade"),
match.JSONKeyArrayOfSize(sce+".results", 2),

// the results can be in either order: check that both are there and that the content is as expected
match.JSONCheckOff(sce+".results", []interface{}{eventBeforeUpgrade, eventAfterUpgrade}, func(res gjson.Result) interface{} {
return res.Get("result.event_id").Str
}, func(eventID interface{}, result gjson.Result) error {
matchers := []match.JSON{
match.JSONKeyEqual("result.type", "m.room.message"),
match.JSONKeyEqual("result.content.body", expectedEvents[eventID.(string)]),
}
for _, jm := range matchers {
if err := jm([]byte(result.Raw)); err != nil {
return err
}
}
return nil
}),
},
})
})
Expand Down