MM-62079: Fix permissions being reset properly (#29574)
The default role permissions weren't being saved to a separate variable which would have not restored them properly. This was a problem in various other tests, potentially causing side-effects in other flaky tests as well. We fix that, as well as clean up the for loop a bit and mention how many messages were recieved in the failure message so that it becomes clear whether no messages were recieved, or atleast some were received. https://mattermost.atlassian.net/browse/MM-62079 ```release-note NONE ```
Этот коммит содержится в:
Agniva De Sarker
коммит произвёл
GitHub
GitHub
родитель
baf9bf82c9
Коммит
4265df8a07
@@ -55,7 +55,8 @@ func TestCreateBot(t *testing.T) {
|
||||
t.Run("create bot with permissions", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, th.BasicUser.Id, model.TeamUserRoleId, false)
|
||||
@@ -148,7 +149,8 @@ func TestCreateBot(t *testing.T) {
|
||||
t.Run("create bot with null value", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, th.BasicUser.Id, model.TeamUserRoleId, false)
|
||||
@@ -169,7 +171,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("patch non-existent bot", func(t *testing.T) {
|
||||
th := Setup(t)
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.TestForSystemAdminAndLocal(t, func(t *testing.T, client *model.Client4) {
|
||||
_, resp, err := client.PatchBot(context.Background(), model.NewId(), &model.BotPatch{})
|
||||
@@ -181,7 +184,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("system admin and local client can patch any bot", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, th.BasicUser.Id, model.TeamUserRoleId, false)
|
||||
@@ -248,7 +252,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("patch someone else's bot without permission", func(t *testing.T) {
|
||||
th := Setup(t)
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.ServiceSettings.EnableBotAccountCreation = true
|
||||
@@ -273,7 +278,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("patch someone else's bot without permission, but with read others permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, th.BasicUser.Id, model.TeamUserRoleId, false)
|
||||
@@ -301,7 +307,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("patch someone else's bot with permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionManageOthersBots.Id, model.TeamUserRoleId)
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, th.BasicUser.Id, model.TeamUserRoleId, false)
|
||||
@@ -357,7 +364,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("patch my bot without permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, th.BasicUser.Id, model.TeamUserRoleId, false)
|
||||
@@ -391,7 +399,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("patch my bot without permission, but with read permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
@@ -426,7 +435,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("patch my bot with permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionManageBots.Id, model.TeamUserRoleId)
|
||||
@@ -466,7 +476,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("partial patch my bot with permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionManageBots.Id, model.TeamUserRoleId)
|
||||
@@ -506,7 +517,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("update bot, internally managed fields ignored", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionManageBots.Id, model.TeamUserRoleId)
|
||||
@@ -547,7 +559,8 @@ func TestPatchBot(t *testing.T) {
|
||||
t.Run("patch with null bot", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionManageBots.Id, model.TeamUserRoleId)
|
||||
@@ -644,7 +657,8 @@ func TestGetBot(t *testing.T) {
|
||||
th.RemovePermissionFromRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
|
||||
t.Run("get unknown bot", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -657,7 +671,8 @@ func TestGetBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bot1", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -674,7 +689,8 @@ func TestGetBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bot2", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -691,7 +707,8 @@ func TestGetBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bot1 without PermissionReadOthersBots permission", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
@@ -705,7 +722,8 @@ func TestGetBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get myBot without ReadBots OR ReadOthersBots permissions", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionManageBots.Id, model.TeamUserRoleId)
|
||||
@@ -718,7 +736,8 @@ func TestGetBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get deleted bot", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -731,7 +750,8 @@ func TestGetBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get deleted bot, include deleted", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -847,7 +867,8 @@ func TestGetBots(t *testing.T) {
|
||||
CheckOKStatus(t, resp)
|
||||
|
||||
t.Run("get bots, page=0, perPage=10", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -868,7 +889,8 @@ func TestGetBots(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bots, page=0, perPage=1", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -889,7 +911,8 @@ func TestGetBots(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bots, page=1, perPage=2", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -910,7 +933,8 @@ func TestGetBots(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bots, page=2, perPage=2", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -931,7 +955,8 @@ func TestGetBots(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bots, page=0, perPage=10, include deleted", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -952,7 +977,8 @@ func TestGetBots(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bots, page=0, perPage=1, include deleted", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -973,7 +999,8 @@ func TestGetBots(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bots, page=1, perPage=2, include deleted", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -994,7 +1021,8 @@ func TestGetBots(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bots, page=2, perPage=2, include deleted", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -1015,7 +1043,8 @@ func TestGetBots(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bots, page=0, perPage=10, only orphaned", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadOthersBots.Id, model.TeamUserRoleId)
|
||||
@@ -1036,7 +1065,8 @@ func TestGetBots(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("get bots without permission", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionManageBots.Id, model.TeamUserRoleId)
|
||||
@@ -1064,7 +1094,8 @@ func TestDisableBot(t *testing.T) {
|
||||
t.Run("disable bot without permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, th.BasicUser.Id, model.TeamUserRoleId, false)
|
||||
@@ -1093,7 +1124,8 @@ func TestDisableBot(t *testing.T) {
|
||||
t.Run("disable bot without permission, but with read permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
@@ -1123,7 +1155,8 @@ func TestDisableBot(t *testing.T) {
|
||||
t.Run("disable bot with permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionManageBots.Id, model.TeamUserRoleId)
|
||||
@@ -1181,7 +1214,8 @@ func TestEnableBot(t *testing.T) {
|
||||
t.Run("enable bot without permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
_, appErr := th.App.UpdateUserRoles(th.Context, th.BasicUser.Id, model.TeamUserRoleId, false)
|
||||
@@ -1214,7 +1248,8 @@ func TestEnableBot(t *testing.T) {
|
||||
t.Run("enable bot without permission, but with read permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.TeamUserRoleId)
|
||||
@@ -1248,7 +1283,8 @@ func TestEnableBot(t *testing.T) {
|
||||
t.Run("enable bot with permission", func(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.TeamUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionManageBots.Id, model.TeamUserRoleId)
|
||||
@@ -1309,7 +1345,8 @@ func TestAssignBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("system admin and local mode assign bot", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.SystemUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.SystemUserRoleId)
|
||||
@@ -1361,7 +1398,8 @@ func TestAssignBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("random user assign bot", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.SystemUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.SystemUserRoleId)
|
||||
@@ -1396,7 +1434,8 @@ func TestAssignBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("delegated user assign bot", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.SystemUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.SystemUserRoleId)
|
||||
@@ -1435,7 +1474,8 @@ func TestAssignBot(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("bot assigned to bot fails", func(t *testing.T) {
|
||||
defer th.RestoreDefaultRolePermissions(th.SaveDefaultRolePermissions())
|
||||
defaultPerms := th.SaveDefaultRolePermissions()
|
||||
defer th.RestoreDefaultRolePermissions(defaultPerms)
|
||||
|
||||
th.AddPermissionToRole(model.PermissionCreateBot.Id, model.SystemUserRoleId)
|
||||
th.AddPermissionToRole(model.PermissionReadBots.Id, model.SystemUserRoleId)
|
||||
|
||||
Ссылка в новой задаче
Block a user