diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-09-13 12:42:48 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-09-13 12:42:48 -0400 |
| commit | 1e7985a87a72bea9a308cf1506dacc828c6e2e1c (patch) | |
| tree | d4251391dc74a9ff4628dd1bed551c34d806a1b6 /api/apitestlib.go | |
| parent | 05af5d14b8d07b010c70750ae1ac5ddf22c120a7 (diff) | |
| download | chat-1e7985a87a72bea9a308cf1506dacc828c6e2e1c.tar.gz chat-1e7985a87a72bea9a308cf1506dacc828c6e2e1c.tar.bz2 chat-1e7985a87a72bea9a308cf1506dacc828c6e2e1c.zip | |
Modifying permissions system. (#3897)
Diffstat (limited to 'api/apitestlib.go')
| -rw-r--r-- | api/apitestlib.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go index ea0de4716..2511513bb 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -91,7 +91,7 @@ func (me *TestHelper) InitSystemAdmin() *TestHelper { c := &Context{} c.RequestId = model.NewId() c.IpAddress = "cmd_line" - UpdateUserRoles(c, me.SystemAdminUser, model.ROLE_SYSTEM_ADMIN) + UpdateUserRoles(c, me.SystemAdminUser, model.ROLE_SYSTEM_USER.Id+" "+model.ROLE_SYSTEM_ADMIN.Id) me.SystemAdminUser.Password = "Password1" me.LoginSystemAdmin() me.SystemAdminChannel = me.CreateChannel(me.SystemAdminClient, me.SystemAdminTeam) @@ -157,13 +157,15 @@ func LinkUserToTeam(user *model.User, team *model.Team) { func UpdateUserToTeamAdmin(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - tm := &model.TeamMember{TeamId: team.Id, UserId: user.Id, Roles: model.ROLE_TEAM_ADMIN} + tm := &model.TeamMember{TeamId: team.Id, UserId: user.Id, Roles: model.ROLE_TEAM_USER.Id + " " + model.ROLE_TEAM_ADMIN.Id} if tmr := <-Srv.Store.Team().UpdateMember(tm); tmr.Err != nil { + utils.EnableDebugLogForTest() l4g.Error(tmr.Err.Error()) l4g.Close() time.Sleep(time.Second) panic(tmr.Err) } + utils.EnableDebugLogForTest() } func (me *TestHelper) CreateChannel(client *model.Client, team *model.Team) *model.Channel { |