diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-12 12:11:02 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-12 12:11:02 -0400 |
| commit | d1efb66ad7b017f0fbfe6f0c20843b30f396e504 (patch) | |
| tree | 5b48a38382015de815b2d45d58836c5ca06b631c /api/user_test.go | |
| parent | 3f0325fd223dcb3a6eec92f772df1e7541ab0b2b (diff) | |
| parent | 9a701b7e5b31ca803a2d92f0b3b1d7cc68bf3c37 (diff) | |
| download | chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.tar.gz chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.tar.bz2 chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.zip | |
Merge branch 'release-3.0'
Diffstat (limited to 'api/user_test.go')
| -rw-r--r-- | api/user_test.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/api/user_test.go b/api/user_test.go index 9dd57dc20..c34d32c11 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -1109,7 +1109,8 @@ func TestSendPasswordReset(t *testing.T) { t.Fatal("Should have errored - bad email") } - user2 := &model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", AuthData: "1", AuthService: "random"} + authData := model.NewId() + user2 := &model.User{Email: strings.ToLower(model.NewId()) + "success+test@simulator.amazonses.com", Nickname: "Corey Hulen", AuthData: &authData, AuthService: "random"} user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) LinkUserToTeam(user2, team) store.Must(Srv.Store.User().VerifyEmail(user2.Id)) @@ -1178,7 +1179,8 @@ func TestResetPassword(t *testing.T) { recovery = result.Data.(*model.PasswordRecovery) } - if result := <-Srv.Store.User().UpdateAuthData(user.Id, "random", "1", ""); result.Err != nil { + authData := model.NewId() + if result := <-Srv.Store.User().UpdateAuthData(user.Id, "random", &authData, ""); result.Err != nil { t.Fatal(result.Err) } |