From c09f1b9e4e5638080622ff9aa70735db382a16df Mon Sep 17 00:00:00 2001 From: hmhealey Date: Thu, 9 Jul 2015 13:59:19 -0400 Subject: Renamed FullName column in database to Nickname. Renamed all serverside references from FullName to Nickname. --- model/user_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'model/user_test.go') diff --git a/model/user_test.go b/model/user_test.go index df9ac19c2..013bacc1c 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -80,12 +80,12 @@ func TestUserIsValid(t *testing.T) { } user.Email = "test@nowhere.com" - user.FullName = strings.Repeat("01234567890", 20) + user.Nickname = strings.Repeat("01234567890", 20) if err := user.IsValid(); err == nil { t.Fatal() } - user.FullName = "" + user.Nickname = "" if err := user.IsValid(); err != nil { t.Fatal(err) } -- cgit v1.2.3-1-g7c22 From abcb44089c421872de582584049ca4cc6b268f37 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 13 Jul 2015 16:43:59 -0400 Subject: Add tests to check if a User's first/last name are valid --- model/user_test.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'model/user_test.go') diff --git a/model/user_test.go b/model/user_test.go index 013bacc1c..4db099f97 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -89,4 +89,21 @@ func TestUserIsValid(t *testing.T) { if err := user.IsValid(); err != nil { t.Fatal(err) } + + user.FirstName = "" + user.LastName = "" + if err := user.IsValid(); err != nil { + t.Fatal(err) + } + + user.FirstName = strings.Repeat("01234567890", 20) + if err := user.IsValid(); err == nil { + t.Fatal(err) + } + + user.FirstName = "" + user.LastName = strings.Repeat("01234567890", 20) + if err := user.IsValid(); err == nil { + t.Fatal(err) + } } -- cgit v1.2.3-1-g7c22 From 098cbcdc21effeebe7e57fbd912a785e85cbfc5d Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 13 Jul 2015 17:47:57 -0400 Subject: Unify all locations where we determine a user's display named based off of their nickname/username into a helper function --- model/user_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'model/user_test.go') diff --git a/model/user_test.go b/model/user_test.go index 4db099f97..a0c62676a 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -107,3 +107,16 @@ func TestUserIsValid(t *testing.T) { t.Fatal(err) } } + +func TestUserGetDisplayName(t *testing.T) { + user := User{FirstName: "first", LastName: "last", Username: "user"} + + if displayName := user.GetDisplayName(); displayName != "user" { + t.Fatal("Display name should be username") + } + + user.Nickname = "nickname" + if displayName := user.GetDisplayName(); displayName != "nickname" { + t.Fatal("Display name should be nickname") + } +} -- cgit v1.2.3-1-g7c22 From 1dba330146a10718a2fc9eac0ae7d6e1d6bc0d79 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Tue, 14 Jul 2015 17:07:19 -0400 Subject: Use a user's full name as their display name if a nickname hasn't been specified --- model/user_test.go | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'model/user_test.go') diff --git a/model/user_test.go b/model/user_test.go index a0c62676a..a48c3f2e7 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -108,13 +108,43 @@ func TestUserIsValid(t *testing.T) { } } +func TestUserGetFullName(t *testing.T) { + user := User{} + + if fullName := user.GetFullName(); fullName != "" { + t.Fatal("Full name should be blank") + } + + user.FirstName = "first" + if fullName := user.GetFullName(); fullName != "first" { + t.Fatal("Full name should be first name") + } + + user.FirstName = "" + user.LastName = "last" + if fullName := user.GetFullName(); fullName != "last" { + t.Fatal("Full name should be last name") + } + + user.FirstName = "first" + if fullName := user.GetFullName(); fullName != "first last" { + t.Fatal("Full name should be first name and last name") + } +} + func TestUserGetDisplayName(t *testing.T) { - user := User{FirstName: "first", LastName: "last", Username: "user"} + user := User{Username: "user"} if displayName := user.GetDisplayName(); displayName != "user" { t.Fatal("Display name should be username") } + user.FirstName = "first" + user.LastName = "last" + if displayName := user.GetDisplayName(); displayName != "first last" { + t.Fatal("Display name should be full name") + } + user.Nickname = "nickname" if displayName := user.GetDisplayName(); displayName != "nickname" { t.Fatal("Display name should be nickname") -- cgit v1.2.3-1-g7c22