Fixed updating mention keys when a user's username changes (#2774)

1 files changed, 27 insertions, 0 deletions

diff --git a/model/user_test.go b/model/user_test.go
index 286c92a66..c6f7dfecc 100644
--- a/model/user_test.go
+++ b/model/user_test.go
@@ -41,6 +41,33 @@ func TestUserPreUpdate(t *testing.T) {
 	user.PreUpdate()
 }
 
+func TestUserUpdateMentionKeysFromUsername(t *testing.T) {
+	user := User{Username: "user"}
+	user.SetDefaultNotifications()
+
+	if user.NotifyProps["mention_keys"] != "user,@user" {
+		t.Fatal("default mention keys are invalid: %v", user.NotifyProps["mention_keys"])
+	}
+
+	user.Username = "person"
+	user.UpdateMentionKeysFromUsername("user")
+	if user.NotifyProps["mention_keys"] != "person,@person" {
+		t.Fatal("mention keys are invalid after changing username: %v", user.NotifyProps["mention_keys"])
+	}
+
+	user.NotifyProps["mention_keys"] += ",mention"
+	user.UpdateMentionKeysFromUsername("person")
+	if user.NotifyProps["mention_keys"] != "person,@person,mention" {
+		t.Fatal("mention keys are invalid after adding extra mention keyword: %v", user.NotifyProps["mention_keys"])
+	}
+
+	user.Username = "user"
+	user.UpdateMentionKeysFromUsername("person")
+	if user.NotifyProps["mention_keys"] != "user,@user,mention" {
+		t.Fatal("mention keys are invalid after changing username with extra mention keyword: %v", user.NotifyProps["mention_keys"])
+	}
+}
+
 func TestUserIsValid(t *testing.T) {
 	user := User{}