diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-22 12:12:50 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-22 12:12:50 -0700 |
| commit | 88e5a71e8c93b495cedaa07931a4f8052d9f12ed (patch) | |
| tree | 603174fc3758d56b8a027b9e1fbe1a5d8690b3e6 /api/user_test.go | |
| parent | 08a3acbb44b043b9bb56f9b96e91432352d06d1a (diff) | |
| download | chat-88e5a71e8c93b495cedaa07931a4f8052d9f12ed.tar.gz chat-88e5a71e8c93b495cedaa07931a4f8052d9f12ed.tar.bz2 chat-88e5a71e8c93b495cedaa07931a4f8052d9f12ed.zip | |
Adding service settings to admin console
Diffstat (limited to 'api/user_test.go')
| -rw-r--r-- | api/user_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/user_test.go b/api/user_test.go index 7451cb615..34eefce59 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -151,7 +151,7 @@ func TestLogin(t *testing.T) { props["display_name"] = rteam2.Data.(*model.Team).DisplayName props["time"] = fmt.Sprintf("%v", model.GetMillis()) data := model.MapToJson(props) - hash := model.HashPassword(fmt.Sprintf("%v:%v", data, utils.Cfg.ServiceSettings.InviteSalt)) + hash := model.HashPassword(fmt.Sprintf("%v:%v", data, utils.Cfg.EmailSettings.InviteSalt)) ruser2, _ := Client.CreateUserFromSignup(&user2, data, hash) @@ -814,7 +814,7 @@ func TestResetPassword(t *testing.T) { props["user_id"] = user.Id props["time"] = fmt.Sprintf("%v", model.GetMillis()) data["data"] = model.MapToJson(props) - data["hash"] = model.HashPassword(fmt.Sprintf("%v:%v", data["data"], utils.Cfg.ServiceSettings.ResetSalt)) + data["hash"] = model.HashPassword(fmt.Sprintf("%v:%v", data["data"], utils.Cfg.EmailSettings.PasswordResetSalt)) data["name"] = team.Name if _, err := Client.ResetPassword(data); err != nil { |