From eea64f8049d90c5dcf14a739d640f5aa6a9c7add Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Fri, 30 Jun 2017 16:06:59 +0800 Subject: [PLT-5864] Move teammate name display setting to the System Console (#6681) * move teammate name display setting to the system console * update all the likes of TeammateNameDisplay names * fix gofmt error * rebase and fix conflict --- model/user_test.go | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'model/user_test.go') diff --git a/model/user_test.go b/model/user_test.go index fc153248f..4502263c3 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -179,20 +179,37 @@ func TestUserGetFullName(t *testing.T) { } func TestUserGetDisplayName(t *testing.T) { - user := User{Username: "user"} + user := User{Username: "username"} + + if displayName := user.GetDisplayName(SHOW_FULLNAME); displayName != "username" { + t.Fatal("Display name should be username") + } + + if displayName := user.GetDisplayName(SHOW_NICKNAME_FULLNAME); displayName != "username" { + t.Fatal("Display name should be username") + } - if displayName := user.GetDisplayName(); displayName != "user" { + if displayName := user.GetDisplayName(SHOW_USERNAME); displayName != "username" { t.Fatal("Display name should be username") } user.FirstName = "first" user.LastName = "last" - if displayName := user.GetDisplayName(); displayName != "first last" { + + if displayName := user.GetDisplayName(SHOW_FULLNAME); displayName != "first last" { t.Fatal("Display name should be full name") } + if displayName := user.GetDisplayName(SHOW_NICKNAME_FULLNAME); displayName != "first last" { + t.Fatal("Display name should be full name since there is no nickname") + } + + if displayName := user.GetDisplayName(SHOW_USERNAME); displayName != "username" { + t.Fatal("Display name should be username") + } + user.Nickname = "nickname" - if displayName := user.GetDisplayName(); displayName != "nickname" { + if displayName := user.GetDisplayName(SHOW_NICKNAME_FULLNAME); displayName != "nickname" { t.Fatal("Display name should be nickname") } } -- cgit v1.2.3-1-g7c22