diff options
author | Jesús Espino <jespinog@gmail.com> | 2018-09-27 16:15:41 +0200 |
---|---|---|
committer | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-09-27 16:15:41 +0200 |
commit | 49e0473753c2e4e2e02e30c17a7793657b71363f (patch) | |
tree | 944fe36b0a1982705b2fa98da466867285d00652 /store/storetest/channel_store.go | |
parent | 89852d04c064588f24c6122caf18b8e656399f94 (diff) | |
download | chat-49e0473753c2e4e2e02e30c17a7793657b71363f.tar.gz chat-49e0473753c2e4e2e02e30c17a7793657b71363f.tar.bz2 chat-49e0473753c2e4e2e02e30c17a7793657b71363f.zip |
MM-11567: Autocomplete search in: for DMs and GMs (#9430)
* MM-11567: Autocomplete search in: for DMs and GMs
* Adding unit tests
* Allowing to search Direct Messages in the autocompletion
* Fix it in TE
Diffstat (limited to 'store/storetest/channel_store.go')
-rw-r--r-- | store/storetest/channel_store.go | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go index 636d96649..7cb86242f 100644 --- a/store/storetest/channel_store.go +++ b/store/storetest/channel_store.go @@ -2023,6 +2023,30 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { } func testChannelStoreAutocompleteInTeamForSearch(t *testing.T, ss store.Store) { + u1 := &model.User{} + u1.Email = MakeEmail() + u1.Username = "user1" + model.NewId() + u1.Nickname = model.NewId() + store.Must(ss.User().Save(u1)) + + u2 := &model.User{} + u2.Email = MakeEmail() + u2.Username = "user2" + model.NewId() + u2.Nickname = model.NewId() + store.Must(ss.User().Save(u2)) + + u3 := &model.User{} + u3.Email = MakeEmail() + u3.Username = "user3" + model.NewId() + u3.Nickname = model.NewId() + store.Must(ss.User().Save(u3)) + + u4 := &model.User{} + u4.Email = MakeEmail() + u4.Username = "user4" + model.NewId() + u4.Nickname = model.NewId() + store.Must(ss.User().Save(u4)) + o1 := model.Channel{} o1.TeamId = model.NewId() o1.DisplayName = "ChannelA" @@ -2032,7 +2056,7 @@ func testChannelStoreAutocompleteInTeamForSearch(t *testing.T, ss store.Store) { m1 := model.ChannelMember{} m1.ChannelId = o1.Id - m1.UserId = model.NewId() + m1.UserId = u1.Id m1.NotifyProps = model.GetDefaultChannelNotifyProps() store.Must(ss.Channel().SaveMember(&m1)) @@ -2084,17 +2108,22 @@ func testChannelStoreAutocompleteInTeamForSearch(t *testing.T, ss store.Store) { o5.Type = model.CHANNEL_PRIVATE store.Must(ss.Channel().Save(&o5, -1)) + store.Must(ss.Channel().CreateDirectChannel(u1.Id, u2.Id)) + store.Must(ss.Channel().CreateDirectChannel(u2.Id, u3.Id)) + tt := []struct { name string term string includeDeleted bool expectedMatches int }{ - {"Empty search (list all)", "", false, 3}, + {"Empty search (list all)", "", false, 4}, {"Narrow search", "ChannelA", false, 2}, {"Wide search", "Cha", false, 3}, + {"Direct messages", "user", false, 1}, {"Wide search with archived channels", "Cha", true, 4}, {"Narrow with archived channels", "ChannelA", true, 3}, + {"Direct messages with archived channels", "user", true, 1}, {"Search without results", "blarg", true, 0}, } |