summaryrefslogtreecommitdiffstats
path: root/api/user_test.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-14 16:59:24 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-14 16:59:24 -0700
commit3bd350dcaf65a89040f7ea395a19b620819ba03e (patch)
tree72b49e6fadfc1d513489b8938d5f73620ff2a6d8 /api/user_test.go
parente06e292be71ca699d90bafbd635118aa47c2d7a5 (diff)
parentbfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff)
downloadchat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.gz
chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.bz2
chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.zip
Merge branch 'master' into PLT-12-log
Diffstat (limited to 'api/user_test.go')
-rw-r--r--api/user_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/user_test.go b/api/user_test.go
index 8c037fdf3..fe5a4a27f 100644
--- a/api/user_test.go
+++ b/api/user_test.go
@@ -509,7 +509,7 @@ func TestUserUpdate(t *testing.T) {
user.TeamId = "12345678901234567890123456"
user.LastActivityAt = time2
user.LastPingAt = time2
- user.Roles = model.ROLE_ADMIN
+ user.Roles = model.ROLE_TEAM_ADMIN
user.LastPasswordUpdate = 123
if result, err := Client.UpdateUser(user); err != nil {