Merge pull request #2064 from hmhealey/plt882

PLT-882 Ephemeral Messages and Out-Of-Channel mentions

1 files changed, 95 insertions, 0 deletions

diff --git a/api/post_test.go b/api/post_test.go
index 1a9fd2579..027043766 100644
--- a/api/post_test.go
+++ b/api/post_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/mattermost/platform/store"
 	"github.com/mattermost/platform/utils"
 	"net/http"
+	"strings"
 	"testing"
 	"time"
 )
@@ -857,3 +858,97 @@ func TestMakeDirectChannelVisible(t *testing.T) {
 		t.Fatal("Failed to set direct channel to be visible for user2")
 	}
 }
+
+func TestGetOutOfChannelMentions(t *testing.T) {
+	Setup()
+
+	team1 := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Type: model.TEAM_OPEN}
+	team1 = Client.Must(Client.CreateTeam(team1)).Data.(*model.Team)
+
+	user1 := &model.User{TeamId: team1.Id, Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "pwd", Username: "user1"}
+	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
+	store.Must(Srv.Store.User().VerifyEmail(user1.Id))
+
+	user2 := &model.User{TeamId: team1.Id, Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "pwd", Username: "user2"}
+	user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User)
+	store.Must(Srv.Store.User().VerifyEmail(user2.Id))
+
+	user3 := &model.User{TeamId: team1.Id, Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "pwd", Username: "user3"}
+	user3 = Client.Must(Client.CreateUser(user3, "")).Data.(*model.User)
+	store.Must(Srv.Store.User().VerifyEmail(user3.Id))
+
+	Client.Must(Client.LoginByEmail(team1.Name, user1.Email, "pwd"))
+
+	channel1 := &model.Channel{DisplayName: "Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team1.Id}
+	channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel)
+
+	var allProfiles map[string]*model.User
+	if result := <-Srv.Store.User().GetProfiles(team1.Id); result.Err != nil {
+		t.Fatal(result.Err)
+	} else {
+		allProfiles = result.Data.(map[string]*model.User)
+	}
+
+	var members []model.ChannelMember
+	if result := <-Srv.Store.Channel().GetMembers(channel1.Id); result.Err != nil {
+		t.Fatal(result.Err)
+	} else {
+		members = result.Data.([]model.ChannelMember)
+	}
+
+	// test a post that doesn't @mention anybody
+	post1 := &model.Post{ChannelId: channel1.Id, Message: "user1 user2 user3"}
+	if mentioned := getOutOfChannelMentions(post1, allProfiles, members); len(mentioned) != 0 {
+		t.Fatalf("getOutOfChannelMentions returned %v when no users were mentioned", mentioned)
+	}
+
+	// test a post that @mentions someone in the channel
+	post2 := &model.Post{ChannelId: channel1.Id, Message: "@user1 is user1"}
+	if mentioned := getOutOfChannelMentions(post2, allProfiles, members); len(mentioned) != 0 {
+		t.Fatalf("getOutOfChannelMentions returned %v when only users in the channel were mentioned", mentioned)
+	}
+
+	// test a post that @mentions someone not in the channel
+	post3 := &model.Post{ChannelId: channel1.Id, Message: "@user2 and @user3 aren't in the channel"}
+	if mentioned := getOutOfChannelMentions(post3, allProfiles, members); len(mentioned) != 2 || (mentioned[0].Id != user2.Id && mentioned[0].Id != user3.Id) || (mentioned[1].Id != user2.Id && mentioned[1].Id != user3.Id) {
+		t.Fatalf("getOutOfChannelMentions returned %v when two users outside the channel were mentioned", mentioned)
+	}
+
+	// test a post that @mentions someone not in the channel as well as someone in the channel
+	post4 := &model.Post{ChannelId: channel1.Id, Message: "@user2 and @user1 might be in the channel"}
+	if mentioned := getOutOfChannelMentions(post4, allProfiles, members); len(mentioned) != 1 || mentioned[0].Id != user2.Id {
+		t.Fatalf("getOutOfChannelMentions returned %v when someone in the channel and someone  outside the channel were mentioned", mentioned)
+	}
+
+	Client.Must(Client.Logout())
+
+	team2 := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Type: model.TEAM_OPEN}
+	team2 = Client.Must(Client.CreateTeam(team2)).Data.(*model.Team)
+
+	user4 := &model.User{TeamId: team2.Id, Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", Password: "pwd", Username: "user4"}
+	user4 = Client.Must(Client.CreateUser(user4, "")).Data.(*model.User)
+	store.Must(Srv.Store.User().VerifyEmail(user4.Id))
+
+	Client.Must(Client.LoginByEmail(team2.Name, user4.Email, "pwd"))
+
+	channel2 := &model.Channel{DisplayName: "Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team2.Id}
+	channel2 = Client.Must(Client.CreateChannel(channel2)).Data.(*model.Channel)
+
+	if result := <-Srv.Store.User().GetProfiles(team2.Id); result.Err != nil {
+		t.Fatal(result.Err)
+	} else {
+		allProfiles = result.Data.(map[string]*model.User)
+	}
+
+	if result := <-Srv.Store.Channel().GetMembers(channel2.Id); result.Err != nil {
+		t.Fatal(result.Err)
+	} else {
+		members = result.Data.([]model.ChannelMember)
+	}
+
+	// test a post that @mentions someone on a different team
+	post5 := &model.Post{ChannelId: channel2.Id, Message: "@user2 and @user3 might be in the channel"}
+	if mentioned := getOutOfChannelMentions(post5, allProfiles, members); len(mentioned) != 0 {
+		t.Fatalf("getOutOfChannelMentions returned %v when two users on a different team were mentioned", mentioned)
+	}
+}