Merging performance branch into master (#4268)
* improve performance on sendNotifications * Fix SQL queries * Remove get direct profiles, not needed anymore * Add raw data to error details if AppError fails to decode * men * Fix decode (#4052) * Fixing json decode * Adding unit test * Initial work for client scaling (#4051) * Begin adding paging to profiles API * Added more paging functionality * Finish hooking up admin console user lists * Add API for searching users and add searching to all user lists * Add lazy loading of profiles * Revert config.json * Fix unit tests and some style issues * Add GetProfilesFromList to Go driver and fix web unit test * Update etag for GetProfiles * Updating ui for filters and pagination (#4044) * Updating UI for pagination * Adjusting margins for filter row * Adjusting margin for specific modals * Adding relative padding to system console * Adjusting responsive view * Update client user tests * Minor fixes for direct messages modal (#4056) * Remove some unneeded initial load calls (#4057) * UX updates to user lists, added smart counts and bug fixes (#4059) * Improved getExplicitMentions and unit tests (#4064) * Refactor getting posts to lazy load profiles correctly (#4062) * Comment out SetActiveChannel test (#4066) * Profiler cpu, block, and memory profiler. (#4081) * Fix TestSetActiveChannel unit test (#4071) * Fixing build failure caused by dependancies updating (#4076) * Adding profiler * Fix admin_team_member_dropdown eslint errors * Bumping session cache size (#4077) * Bumping session cache size * Bumping status cache * Refactor how the client handles channel members to be large team friendly (#4106) * Refactor how the client handles channel members to be large team friendly * Change Id to ChannelId in ChannelStats model * Updated getChannelMember and getProfilesByIds routes to match proposal * Performance improvements (#4100) * Performance improvements * Fixing re-connect issue * Fixing error message * Some other minor perf tweaks * Some other minor perf tweaks * Fixing config file * Fixing buffer size * Fixing web socket send message * adding some error logging * fix getMe to be user required * Fix websocket event for new user * Fixing shutting down * Reverting web socket changes * Fixing logging lvl * Adding caching to GetMember * Adding some logging * Fixing caching * Fixing caching invalidate * Fixing direct message caching * Fixing caching * Fixing caching * Remove GetDirectProfiles from initial load * Adding logging and fixing websocket client * Adding back caching from bad merge. * Explicitly close go driver requests (#4162) * Refactored how the client handles team members to be more large team friendly (#4159) * Refactor getProfilesForDirectMessageList API into getAllProfiles API * Refactored how the client handles team members to be more large team friendly * Fix js error when receiving a notification * Fix JS error caused by current user being overwritten with sanitized version (#4165) * Adding error message to status failure (#4167) * Fix a few bugs caused by client scaling refactoring (#4170) * When there is no read replica, don't open a second set of connections to the master database (#4173) * Adding connection tacking to stats (#4174) * Reduce DB writes for statuses and other status related changes (#4175) * Fix bug preventing opening of DM channels from more modal (#4181) * Fixing socket timing error (#4183) * Fixing ping/pong handler * Fixing socket timing error * Commenting out status broadcasting * Removing user status changes * Removing user status changes * Removing user status changes * Removing user status changes * Adding DoPreComputeJson() * Performance improvements (#4194) * * Fix System Console Analytics queries * Add db.SetConnMaxLifetime to 15 minutes * Add "net/http/pprof" for profiling * Add FreeOSMemory() to manually release memory on reload config * Add flag to enable http profiler * Fix memory leak (#4197) * Fix memory leak * removed unneeded nil assignment * Fixing go routine leak (#4208) * Merge fixes * Merge fix * Refactored statuses to be queried by the client rather than broadcast by the server (#4212) * Refactored server code to reduce status broadcasts and to allow getting statuses by IDs * Refactor client code to periodically fetch statuses * Add store unit test for getting statuses by ids * Fix status unit test * Add getStatusesByIds REST API and move the client over to use that instead of the WebSocket * Adding multiple threads to websocket hub (#4230) * Adding multiple threads to websocket hub * Fixing unit tests * Fixing so websocket connections from the same user end up in the same… (#4240) * Fixing so websocket connections from the same user end up in the same list * Removing old comment * Refactor user autocomplete to query the server (#4239) * Add API for autocompleting users * Converted at mention autocomplete to query server * Converted user search autocomplete to query server * Switch autocomplete API naming to use term instead of username * Split autocomplete API into two, one for channels and for teams * Fix copy/paste error * Some final client scaling fixes (#4246) * Add lazy loading of profiles to integration pages * Add lazy loading of profiles to emoji page * Fix JS error when receiving post in select team menu and also clean up channel store
Этот коммит содержится в:
Joram Wilander
коммит произвёл
GitHub
GitHub
родитель
0512bd26ee
Коммит
365b8b465e
514
api/user_test.go
514
api/user_test.go
@@ -435,7 +435,7 @@ func TestGetUser(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
if userMap, err := Client.GetProfiles(rteam.Data.(*model.Team).Id, ""); err != nil {
|
||||
if userMap, err := Client.GetProfilesInTeam(rteam.Data.(*model.Team).Id, 0, 100, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else if len(userMap.Data.(map[string]*model.User)) != 2 {
|
||||
t.Fatal("should have been 2")
|
||||
@@ -444,7 +444,7 @@ func TestGetUser(t *testing.T) {
|
||||
} else {
|
||||
|
||||
// test etag caching
|
||||
if cache_result, err := Client.GetProfiles(rteam.Data.(*model.Team).Id, userMap.Etag); err != nil {
|
||||
if cache_result, err := Client.GetProfilesInTeam(rteam.Data.(*model.Team).Id, 0, 100, userMap.Etag); err != nil {
|
||||
t.Fatal(err)
|
||||
} else if cache_result.Data.(map[string]*model.User) != nil {
|
||||
t.Log(cache_result.Data)
|
||||
@@ -452,7 +452,25 @@ func TestGetUser(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
if _, err := Client.GetProfiles(rteam2.Data.(*model.Team).Id, ""); err == nil {
|
||||
if userMap, err := Client.GetProfilesInTeam(rteam.Data.(*model.Team).Id, 0, 1, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else if len(userMap.Data.(map[string]*model.User)) != 1 {
|
||||
t.Fatal("should have been 1")
|
||||
}
|
||||
|
||||
if userMap, err := Client.GetProfilesInTeam(rteam.Data.(*model.Team).Id, 1, 1, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else if len(userMap.Data.(map[string]*model.User)) != 1 {
|
||||
t.Fatal("should have been 1")
|
||||
}
|
||||
|
||||
if userMap, err := Client.GetProfilesInTeam(rteam.Data.(*model.Team).Id, 10, 10, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else if len(userMap.Data.(map[string]*model.User)) != 0 {
|
||||
t.Fatal("should have been 0")
|
||||
}
|
||||
|
||||
if _, err := Client.GetProfilesInTeam(rteam2.Data.(*model.Team).Id, 0, 100, ""); err == nil {
|
||||
t.Fatal("shouldn't have access")
|
||||
}
|
||||
|
||||
@@ -468,12 +486,12 @@ func TestGetUser(t *testing.T) {
|
||||
|
||||
Client.Login(user.Email, "passwd1")
|
||||
|
||||
if _, err := Client.GetProfiles(rteam2.Data.(*model.Team).Id, ""); err != nil {
|
||||
if _, err := Client.GetProfilesInTeam(rteam2.Data.(*model.Team).Id, 0, 100, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetDirectProfiles(t *testing.T) {
|
||||
func TestGetProfiles(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
|
||||
th.BasicClient.Must(th.BasicClient.CreateDirectChannel(th.BasicUser2.Id))
|
||||
@@ -485,62 +503,7 @@ func TestGetDirectProfiles(t *testing.T) {
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = true
|
||||
|
||||
if result, err := th.BasicClient.GetDirectProfiles(""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
|
||||
if len(users) != 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
if users[th.BasicUser2.Id] == nil {
|
||||
t.Fatal("missing expected user")
|
||||
}
|
||||
|
||||
for _, user := range users {
|
||||
if user.Email == "" {
|
||||
t.Fatal("problem with show email")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = false
|
||||
|
||||
if result, err := th.BasicClient.GetDirectProfiles(""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
|
||||
if len(users) != 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
if users[th.BasicUser2.Id] == nil {
|
||||
t.Fatal("missing expected user")
|
||||
}
|
||||
|
||||
for _, user := range users {
|
||||
if user.Email != "" {
|
||||
t.Fatal("problem with show email")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetProfilesForDirectMessageList(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
|
||||
th.BasicClient.Must(th.BasicClient.CreateDirectChannel(th.BasicUser2.Id))
|
||||
|
||||
prevShowEmail := utils.Cfg.PrivacySettings.ShowEmailAddress
|
||||
defer func() {
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = prevShowEmail
|
||||
}()
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = true
|
||||
|
||||
if result, err := th.BasicClient.GetProfilesForDirectMessageList(th.BasicTeam.Id); err != nil {
|
||||
if result, err := th.BasicClient.GetProfiles(0, 100, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
@@ -554,11 +517,20 @@ func TestGetProfilesForDirectMessageList(t *testing.T) {
|
||||
t.Fatal("problem with show email")
|
||||
}
|
||||
}
|
||||
|
||||
// test etag caching
|
||||
if cache_result, err := th.BasicClient.GetProfiles(0, 100, result.Etag); err != nil {
|
||||
t.Fatal(err)
|
||||
} else if cache_result.Data.(map[string]*model.User) != nil {
|
||||
t.Log(cache_result.Etag)
|
||||
t.Log(result.Etag)
|
||||
t.Fatal("cache should be empty")
|
||||
}
|
||||
}
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = false
|
||||
|
||||
if result, err := th.BasicClient.GetProfilesForDirectMessageList(th.BasicTeam.Id); err != nil {
|
||||
if result, err := th.BasicClient.GetProfiles(0, 100, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
@@ -575,6 +547,61 @@ func TestGetProfilesForDirectMessageList(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetProfilesByIds(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
|
||||
prevShowEmail := utils.Cfg.PrivacySettings.ShowEmailAddress
|
||||
defer func() {
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = prevShowEmail
|
||||
}()
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = true
|
||||
|
||||
if result, err := th.BasicClient.GetProfilesByIds([]string{th.BasicUser.Id}); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
|
||||
if len(users) != 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
for _, user := range users {
|
||||
if user.Email == "" {
|
||||
t.Fatal("problem with show email")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = false
|
||||
|
||||
if result, err := th.BasicClient.GetProfilesByIds([]string{th.BasicUser.Id}); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
|
||||
if len(users) != 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
for _, user := range users {
|
||||
if user.Email != "" {
|
||||
t.Fatal("problem with show email")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if result, err := th.BasicClient.GetProfilesByIds([]string{th.BasicUser.Id, th.BasicUser2.Id}); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
|
||||
if len(users) != 2 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetAudits(t *testing.T) {
|
||||
th := Setup()
|
||||
Client := th.CreateClient()
|
||||
@@ -1837,3 +1864,366 @@ func TestUserTyping(t *testing.T) {
|
||||
t.Fatal("did not receive typing event")
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetProfilesInChannel(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
Client := th.BasicClient
|
||||
|
||||
prevShowEmail := utils.Cfg.PrivacySettings.ShowEmailAddress
|
||||
defer func() {
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = prevShowEmail
|
||||
}()
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = true
|
||||
|
||||
if result, err := Client.GetProfilesInChannel(th.BasicChannel.Id, 0, 100, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
|
||||
if len(users) < 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
for _, user := range users {
|
||||
if user.Email == "" {
|
||||
t.Fatal("problem with show email")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
th.LoginBasic2()
|
||||
|
||||
if _, err := Client.GetProfilesInChannel(th.BasicChannel.Id, 0, 100, ""); err == nil {
|
||||
t.Fatal("should not have access")
|
||||
}
|
||||
|
||||
Client.Must(Client.JoinChannel(th.BasicChannel.Id))
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = false
|
||||
|
||||
if result, err := Client.GetProfilesInChannel(th.BasicChannel.Id, 0, 100, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
|
||||
if len(users) < 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
found := false
|
||||
for _, user := range users {
|
||||
if user.Email != "" {
|
||||
t.Fatal("problem with show email")
|
||||
}
|
||||
if user.Id == th.BasicUser2.Id {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
|
||||
if !found {
|
||||
t.Fatal("should have found profile")
|
||||
}
|
||||
}
|
||||
|
||||
user := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"}
|
||||
Client.Must(Client.CreateUser(&user, ""))
|
||||
|
||||
Client.Login(user.Email, "passwd1")
|
||||
Client.SetTeamId("junk")
|
||||
|
||||
if _, err := Client.GetProfilesInChannel(th.BasicChannel.Id, 0, 100, ""); err == nil {
|
||||
t.Fatal("should not have access")
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetProfilesNotInChannel(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
Client := th.BasicClient
|
||||
|
||||
prevShowEmail := utils.Cfg.PrivacySettings.ShowEmailAddress
|
||||
defer func() {
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = prevShowEmail
|
||||
}()
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = true
|
||||
|
||||
if result, err := Client.GetProfilesNotInChannel(th.BasicChannel.Id, 0, 100, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
|
||||
if len(users) < 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
found := false
|
||||
for _, user := range users {
|
||||
if user.Email == "" {
|
||||
t.Fatal("problem with show email")
|
||||
}
|
||||
if user.Id == th.BasicUser2.Id {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
|
||||
if !found {
|
||||
t.Fatal("should have found profile")
|
||||
}
|
||||
}
|
||||
|
||||
user := &model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"}
|
||||
user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User)
|
||||
LinkUserToTeam(user, th.BasicTeam)
|
||||
|
||||
th.LoginBasic2()
|
||||
|
||||
if _, err := Client.GetProfilesNotInChannel(th.BasicChannel.Id, 0, 100, ""); err == nil {
|
||||
t.Fatal("should not have access")
|
||||
}
|
||||
|
||||
Client.Must(Client.JoinChannel(th.BasicChannel.Id))
|
||||
|
||||
utils.Cfg.PrivacySettings.ShowEmailAddress = false
|
||||
|
||||
if result, err := Client.GetProfilesNotInChannel(th.BasicChannel.Id, 0, 100, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.(map[string]*model.User)
|
||||
|
||||
if len(users) < 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
found := false
|
||||
for _, user := range users {
|
||||
if user.Email != "" {
|
||||
t.Fatal("problem with show email")
|
||||
}
|
||||
if user.Id == th.BasicUser2.Id {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
|
||||
if found {
|
||||
t.Fatal("should not have found profile")
|
||||
}
|
||||
}
|
||||
|
||||
user2 := model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "passwd1"}
|
||||
Client.Must(Client.CreateUser(&user2, ""))
|
||||
|
||||
Client.Login(user2.Email, "passwd1")
|
||||
Client.SetTeamId(th.BasicTeam.Id)
|
||||
|
||||
if _, err := Client.GetProfilesNotInChannel(th.BasicChannel.Id, 0, 100, ""); err == nil {
|
||||
t.Fatal("should not have access")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSearchUsers(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
Client := th.BasicClient
|
||||
|
||||
if result, err := Client.SearchUsers(th.BasicUser.Username, "", map[string]string{}); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.([]*model.User)
|
||||
|
||||
found := false
|
||||
for _, user := range users {
|
||||
if user.Id == th.BasicUser.Id {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
|
||||
if !found {
|
||||
t.Fatal("should have found profile")
|
||||
}
|
||||
}
|
||||
|
||||
if result, err := Client.SearchUsers(th.BasicUser.Username, "", map[string]string{"in_channel": th.BasicChannel.Id}); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.([]*model.User)
|
||||
|
||||
if len(users) != 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
found := false
|
||||
for _, user := range users {
|
||||
if user.Id == th.BasicUser.Id {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
|
||||
if !found {
|
||||
t.Fatal("should have found profile")
|
||||
}
|
||||
}
|
||||
|
||||
if result, err := Client.SearchUsers(th.BasicUser2.Username, "", map[string]string{"not_in_channel": th.BasicChannel.Id}); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.([]*model.User)
|
||||
|
||||
if len(users) != 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
found1 := false
|
||||
found2 := false
|
||||
for _, user := range users {
|
||||
if user.Id == th.BasicUser.Id {
|
||||
found1 = true
|
||||
} else if user.Id == th.BasicUser2.Id {
|
||||
found2 = true
|
||||
}
|
||||
}
|
||||
|
||||
if found1 {
|
||||
t.Fatal("should not have found profile")
|
||||
}
|
||||
if !found2 {
|
||||
t.Fatal("should have found profile")
|
||||
}
|
||||
}
|
||||
|
||||
if result, err := Client.SearchUsers(th.BasicUser2.Username, th.BasicTeam.Id, map[string]string{"not_in_channel": th.BasicChannel.Id}); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.([]*model.User)
|
||||
|
||||
if len(users) != 1 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
|
||||
found1 := false
|
||||
found2 := false
|
||||
for _, user := range users {
|
||||
if user.Id == th.BasicUser.Id {
|
||||
found1 = true
|
||||
} else if user.Id == th.BasicUser2.Id {
|
||||
found2 = true
|
||||
}
|
||||
}
|
||||
|
||||
if found1 {
|
||||
t.Fatal("should not have found profile")
|
||||
}
|
||||
if !found2 {
|
||||
t.Fatal("should have found profile")
|
||||
}
|
||||
}
|
||||
|
||||
if result, err := Client.SearchUsers(th.BasicUser.Username, "junk", map[string]string{"not_in_channel": th.BasicChannel.Id}); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.([]*model.User)
|
||||
|
||||
if len(users) != 0 {
|
||||
t.Fatal("map was wrong length")
|
||||
}
|
||||
}
|
||||
|
||||
th.LoginBasic2()
|
||||
|
||||
if result, err := Client.SearchUsers(th.BasicUser.Username, "", map[string]string{}); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
users := result.Data.([]*model.User)
|
||||
|
||||
found := false
|
||||
for _, user := range users {
|
||||
if user.Id == th.BasicUser.Id {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
|
||||
if !found {
|
||||
t.Fatal("should have found profile")
|
||||
}
|
||||
}
|
||||
|
||||
if _, err := Client.SearchUsers("", "", map[string]string{}); err == nil {
|
||||
t.Fatal("should have errored - blank term")
|
||||
}
|
||||
|
||||
if _, err := Client.SearchUsers(th.BasicUser.Username, "", map[string]string{"in_channel": th.BasicChannel.Id}); err == nil {
|
||||
t.Fatal("should not have access")
|
||||
}
|
||||
|
||||
if _, err := Client.SearchUsers(th.BasicUser.Username, "", map[string]string{"not_in_channel": th.BasicChannel.Id}); err == nil {
|
||||
t.Fatal("should not have access")
|
||||
}
|
||||
}
|
||||
|
||||
func TestAutocompleteUsers(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
Client := th.BasicClient
|
||||
|
||||
if result, err := Client.AutocompleteUsersInTeam(th.BasicUser.Username); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
autocomplete := result.Data.(*model.UserAutocompleteInTeam)
|
||||
if len(autocomplete.InTeam) != 1 {
|
||||
t.Fatal("should have returned 1 user in")
|
||||
}
|
||||
}
|
||||
|
||||
if result, err := Client.AutocompleteUsersInTeam(th.BasicUser.Username[0:5]); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
autocomplete := result.Data.(*model.UserAutocompleteInTeam)
|
||||
if len(autocomplete.InTeam) < 1 {
|
||||
t.Fatal("should have returned at least 1 user in")
|
||||
}
|
||||
}
|
||||
|
||||
if result, err := Client.AutocompleteUsersInChannel(th.BasicUser.Username, th.BasicChannel.Id); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
autocomplete := result.Data.(*model.UserAutocompleteInChannel)
|
||||
if len(autocomplete.InChannel) != 1 {
|
||||
t.Fatal("should have returned 1 user in")
|
||||
}
|
||||
if len(autocomplete.OutOfChannel) != 0 {
|
||||
t.Fatal("should have returned no users out")
|
||||
}
|
||||
}
|
||||
|
||||
if result, err := Client.AutocompleteUsersInChannel("", th.BasicChannel.Id); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
autocomplete := result.Data.(*model.UserAutocompleteInChannel)
|
||||
if len(autocomplete.InChannel) != 1 && autocomplete.InChannel[0].Id != th.BasicUser2.Id {
|
||||
t.Fatal("should have returned at 1 user in")
|
||||
}
|
||||
if len(autocomplete.OutOfChannel) != 1 && autocomplete.OutOfChannel[0].Id != th.BasicUser2.Id {
|
||||
t.Fatal("should have returned 1 user out")
|
||||
}
|
||||
}
|
||||
|
||||
if result, err := Client.AutocompleteUsersInTeam(""); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
autocomplete := result.Data.(*model.UserAutocompleteInTeam)
|
||||
if len(autocomplete.InTeam) != 2 {
|
||||
t.Fatal("should have returned 2 users in")
|
||||
}
|
||||
}
|
||||
|
||||
if _, err := Client.AutocompleteUsersInChannel("", "junk"); err == nil {
|
||||
t.Fatal("should have errored - bad channel id")
|
||||
}
|
||||
|
||||
Client.SetTeamId("junk")
|
||||
if _, err := Client.AutocompleteUsersInChannel("", th.BasicChannel.Id); err == nil {
|
||||
t.Fatal("should have errored - bad team id")
|
||||
}
|
||||
|
||||
if _, err := Client.AutocompleteUsersInTeam(""); err == nil {
|
||||
t.Fatal("should have errored - bad team id")
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user