summaryrefslogtreecommitdiffstats
path: root/api/admin_test.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-05-12 12:11:02 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-12 12:11:02 -0400
commitd1efb66ad7b017f0fbfe6f0c20843b30f396e504 (patch)
tree5b48a38382015de815b2d45d58836c5ca06b631c /api/admin_test.go
parent3f0325fd223dcb3a6eec92f772df1e7541ab0b2b (diff)
parent9a701b7e5b31ca803a2d92f0b3b1d7cc68bf3c37 (diff)
downloadchat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.tar.gz
chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.tar.bz2
chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.zip
Merge branch 'release-3.0'
Diffstat (limited to 'api/admin_test.go')
-rw-r--r--api/admin_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/api/admin_test.go b/api/admin_test.go
index 933c3d59c..f3d3ec4ed 100644
--- a/api/admin_test.go
+++ b/api/admin_test.go
@@ -457,7 +457,8 @@ func TestAdminResetPassword(t *testing.T) {
t.Fatal("Should have errored - password too short")
}
- 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))