diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-15 13:45:22 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-04-15 13:45:22 -0400 |
commit | 461a0b3b7c14cd59cb53eb66f419c965ab3bdd24 (patch) | |
tree | 88eea69d8963214fa43e8bf1a9989f2ab3d1c521 /app | |
parent | 24667e3e5423dc939770d0b4bf06ed2f42b4a445 (diff) | |
download | chat-461a0b3b7c14cd59cb53eb66f419c965ab3bdd24.tar.gz chat-461a0b3b7c14cd59cb53eb66f419c965ab3bdd24.tar.bz2 chat-461a0b3b7c14cd59cb53eb66f419c965ab3bdd24.zip |
PLT-6113 Added initial unit tests for cmd package (#6086)
* Fixed app.CreateUser not using the provided locale
* Added initial unit tests for cmd package
* Disabled unit tests while we move to 'go build'
Diffstat (limited to 'app')
-rw-r--r-- | app/apptestlib.go | 8 | ||||
-rw-r--r-- | app/user.go | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/apptestlib.go b/app/apptestlib.go index f42529c20..0c7086c64 100644 --- a/app/apptestlib.go +++ b/app/apptestlib.go @@ -75,6 +75,14 @@ func (me *TestHelper) InitBasic() *TestHelper { return me } +func (me *TestHelper) MakeUsername() string { + return "un_" + model.NewId() +} + +func (me *TestHelper) MakeEmail() string { + return "success_" + model.NewId() + "@simulator.amazonses.com" +} + func (me *TestHelper) CreateTeam() *model.Team { id := model.NewId() team := &model.Team{ diff --git a/app/user.go b/app/user.go index 44755b8fa..e339dfd5b 100644 --- a/app/user.go +++ b/app/user.go @@ -186,7 +186,9 @@ func CreateUser(user *model.User) (*model.User, *model.AppError) { } } - user.Locale = *utils.Cfg.LocalizationSettings.DefaultClientLocale + if _, ok := utils.GetSupportedLocales()[user.Locale]; !ok { + user.Locale = *utils.Cfg.LocalizationSettings.DefaultClientLocale + } if ruser, err := createUser(user); err != nil { return nil, err |