From 3f1fca9463df27e8f795356ab6873d0d5bf4d634 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 22 Jun 2017 06:36:46 -0400 Subject: PLT-6759 Show deactivated users in GMs (#6703) * Show deactivated users in GMs * Fix runtime error when DMing deactivated user --- app/notification_test.go | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) (limited to 'app/notification_test.go') diff --git a/app/notification_test.go b/app/notification_test.go index e59ba35d8..022f671ae 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -14,14 +14,14 @@ func TestSendNotifications(t *testing.T) { AddUserToChannel(th.BasicUser2, th.BasicChannel) - post1, postErr := CreatePost(&model.Post{ + post1, err := CreatePost(&model.Post{ UserId: th.BasicUser.Id, ChannelId: th.BasicChannel.Id, Message: "@" + th.BasicUser2.Username, }, th.BasicTeam.Id, true) - if postErr != nil { - t.Fatal(postErr) + if err != nil { + t.Fatal(err) } mentions, err := SendNotifications(post1, th.BasicTeam, th.BasicChannel, th.BasicUser) @@ -34,6 +34,44 @@ func TestSendNotifications(t *testing.T) { t.Log(mentions) t.Fatal("user should have been mentioned") } + + dm, err := CreateDirectChannel(th.BasicUser.Id, th.BasicUser2.Id) + if err != nil { + t.Fatal(err) + } + + post2, err := CreatePost(&model.Post{ + UserId: th.BasicUser.Id, + ChannelId: dm.Id, + Message: "dm message", + }, th.BasicTeam.Id, true) + + if err != nil { + t.Fatal(err) + } + + _, err = SendNotifications(post2, th.BasicTeam, dm, th.BasicUser) + if err != nil { + t.Fatal(err) + } + + UpdateActive(th.BasicUser2, false) + InvalidateAllCaches() + + post3, err := CreatePost(&model.Post{ + UserId: th.BasicUser.Id, + ChannelId: dm.Id, + Message: "dm message", + }, th.BasicTeam.Id, true) + + if err != nil { + t.Fatal(err) + } + + _, err = SendNotifications(post3, th.BasicTeam, dm, th.BasicUser) + if err != nil { + t.Fatal(err) + } } func TestGetExplicitMentions(t *testing.T) { -- cgit v1.2.3-1-g7c22