From 3d5991a80067762d9559fc8337628df7ab296773 Mon Sep 17 00:00:00 2001 From: Michael Kochell <6913320+mickmister@users.noreply.github.com> Date: Thu, 4 May 2023 18:46:22 -0400 Subject: [PATCH] fix merge issue from "Update slash command permission (#22468)" --- api4/command_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api4/command_test.go b/api4/command_test.go index 7d1448bf53..4889492339 100644 --- a/api4/command_test.go +++ b/api4/command_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/v6/app/request" "github.com/mattermost/mattermost-server/v6/model" "github.com/mattermost/mattermost-server/v6/shared/mlog" ) @@ -1068,6 +1069,7 @@ func TestExecuteCommandInTeamUserIsNotOn(t *testing.T) { func TestExecuteCommandReadOnly(t *testing.T) { th := Setup(t).InitBasic() + ctx := request.EmptyContext(th.TestLogger) defer th.TearDown() client := th.Client @@ -1125,6 +1127,7 @@ func TestExecuteCommandReadOnly(t *testing.T) { th.App.SetPhase2PermissionsMigrationStatus(true) _, appErr = th.App.PatchChannelModerationsForChannel( + ctx, th.BasicChannel, []*model.ChannelModerationPatch{{ Name: &model.PermissionCreatePost.Id,