diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-10-31 12:00:21 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-10-31 16:00:21 +0000 |
| commit | 06ec648cf30e3968c0fdb2514c8d59dff97c757c (patch) | |
| tree | c801a9bbbdeca6704b91d5d093cb937db5cd9d00 /api4/apitestlib.go | |
| parent | 6886de04d4215ea45ae535b64a604a79292bff77 (diff) | |
| download | chat-06ec648cf30e3968c0fdb2514c8d59dff97c757c.tar.gz chat-06ec648cf30e3968c0fdb2514c8d59dff97c757c.tar.bz2 chat-06ec648cf30e3968c0fdb2514c8d59dff97c757c.zip | |
PLT-7978 Add websocket event for user role update (#7745)
* Add websocket event for user role update
* Fix tests
* More test fixes
Diffstat (limited to 'api4/apitestlib.go')
| -rw-r--r-- | api4/apitestlib.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index b7d07e89e..d777f8c19 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -194,7 +194,7 @@ func (me *TestHelper) InitBasic() *TestHelper { me.waitForConnectivity() me.TeamAdminUser = me.CreateUser() - me.App.UpdateUserRoles(me.TeamAdminUser.Id, model.ROLE_SYSTEM_USER.Id) + me.App.UpdateUserRoles(me.TeamAdminUser.Id, model.ROLE_SYSTEM_USER.Id, false) me.LoginTeamAdmin() me.BasicTeam = me.CreateTeam() me.BasicChannel = me.CreatePublicChannel() @@ -211,7 +211,7 @@ func (me *TestHelper) InitBasic() *TestHelper { me.App.AddUserToChannel(me.BasicUser2, me.BasicChannel2) me.App.AddUserToChannel(me.BasicUser, me.BasicPrivateChannel) me.App.AddUserToChannel(me.BasicUser2, me.BasicPrivateChannel) - me.App.UpdateUserRoles(me.BasicUser.Id, model.ROLE_SYSTEM_USER.Id) + me.App.UpdateUserRoles(me.BasicUser.Id, model.ROLE_SYSTEM_USER.Id, false) me.LoginBasic() return me @@ -221,7 +221,7 @@ func (me *TestHelper) InitSystemAdmin() *TestHelper { me.waitForConnectivity() me.SystemAdminUser = me.CreateUser() - me.App.UpdateUserRoles(me.SystemAdminUser.Id, model.ROLE_SYSTEM_USER.Id+" "+model.ROLE_SYSTEM_ADMIN.Id) + me.App.UpdateUserRoles(me.SystemAdminUser.Id, model.ROLE_SYSTEM_USER.Id+" "+model.ROLE_SYSTEM_ADMIN.Id, false) me.LoginSystemAdmin() return me |