diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-11-04 12:27:19 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-11-04 12:27:19 -0400 |
| commit | 00787974d0a87b1a54f15cf75d2dab398546b87e (patch) | |
| tree | 6f41b56b10183b6543309b790cd13b1fbf7559af /store/sql_team_store_test.go | |
| parent | 263f29068386cdd3b5393e00ce97f776532c723f (diff) | |
| download | chat-00787974d0a87b1a54f15cf75d2dab398546b87e.tar.gz chat-00787974d0a87b1a54f15cf75d2dab398546b87e.tar.bz2 chat-00787974d0a87b1a54f15cf75d2dab398546b87e.zip | |
PLT-4481 Fix member count for team user lists and channel invite list (#4422)
* Fix member count for team user lists and channel invite list
* Fix client unit test
Diffstat (limited to 'store/sql_team_store_test.go')
| -rw-r--r-- | store/sql_team_store_test.go | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index 46215d9be..0e472a961 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -482,11 +482,27 @@ func TestTeamStoreMemberCount(t *testing.T) { u1.Email = model.NewId() Must(store.User().Save(u1)) + u2 := &model.User{} + u2.Email = model.NewId() + u2.DeleteAt = 1 + Must(store.User().Save(u2)) + teamId1 := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id} Must(store.Team().SaveMember(m1)) - if result := <-store.Team().GetMemberCount(teamId1); result.Err != nil { + m2 := &model.TeamMember{TeamId: teamId1, UserId: u2.Id} + Must(store.Team().SaveMember(m2)) + + if result := <-store.Team().GetTotalMemberCount(teamId1); result.Err != nil { + t.Fatal(result.Err) + } else { + if result.Data.(int64) != 2 { + t.Fatal("wrong count") + } + } + + if result := <-store.Team().GetActiveMemberCount(teamId1); result.Err != nil { t.Fatal(result.Err) } else { if result.Data.(int64) != 1 { @@ -494,10 +510,18 @@ func TestTeamStoreMemberCount(t *testing.T) { } } - m2 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} - Must(store.Team().SaveMember(m2)) + m3 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} + Must(store.Team().SaveMember(m3)) + + if result := <-store.Team().GetTotalMemberCount(teamId1); result.Err != nil { + t.Fatal(result.Err) + } else { + if result.Data.(int64) != 2 { + t.Fatal("wrong count") + } + } - if result := <-store.Team().GetMemberCount(teamId1); result.Err != nil { + if result := <-store.Team().GetActiveMemberCount(teamId1); result.Err != nil { t.Fatal(result.Err) } else { if result.Data.(int64) != 1 { |