From 0aa7ecd5e89f054ae927b246f2aec4bd6348d42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 9 Feb 2018 16:31:01 +0100 Subject: AllowEditPost and PostEditTimeLimit migration (#8208) * AllowEditPost and PostEditTimeLimit migration * Not set EDIT_POST permission to sysadmin_role if ALLOW_EDIT_POST is configured to NEVER * Remove a bit of code duplication --- app/app_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/app_test.go') diff --git a/app/app_test.go b/app/app_test.go index 09e002791..bbc012364 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -109,10 +109,10 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) { model.PERMISSION_UPLOAD_FILE.Id, model.PERMISSION_GET_PUBLIC_LINK.Id, model.PERMISSION_CREATE_POST.Id, - model.PERMISSION_EDIT_POST.Id, model.PERMISSION_USE_SLASH_COMMANDS.Id, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id, model.PERMISSION_DELETE_POST.Id, + model.PERMISSION_EDIT_POST.Id, }, "channel_admin": []string{ model.PERMISSION_MANAGE_CHANNEL_ROLES.Id, @@ -203,7 +203,6 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) { model.PERMISSION_UPLOAD_FILE.Id, model.PERMISSION_GET_PUBLIC_LINK.Id, model.PERMISSION_CREATE_POST.Id, - model.PERMISSION_EDIT_POST.Id, model.PERMISSION_USE_SLASH_COMMANDS.Id, model.PERMISSION_EDIT_OTHERS_POSTS.Id, model.PERMISSION_REMOVE_USER_FROM_TEAM.Id, @@ -214,6 +213,7 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) { model.PERMISSION_MANAGE_SLASH_COMMANDS.Id, model.PERMISSION_MANAGE_OTHERS_SLASH_COMMANDS.Id, model.PERMISSION_MANAGE_WEBHOOKS.Id, + model.PERMISSION_EDIT_POST.Id, }, } @@ -274,10 +274,10 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) { model.PERMISSION_UPLOAD_FILE.Id, model.PERMISSION_GET_PUBLIC_LINK.Id, model.PERMISSION_CREATE_POST.Id, - model.PERMISSION_EDIT_POST.Id, model.PERMISSION_USE_SLASH_COMMANDS.Id, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id, model.PERMISSION_DELETE_POST.Id, + model.PERMISSION_EDIT_POST.Id, }, "channel_admin": []string{ model.PERMISSION_MANAGE_CHANNEL_ROLES.Id, @@ -368,7 +368,6 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) { model.PERMISSION_UPLOAD_FILE.Id, model.PERMISSION_GET_PUBLIC_LINK.Id, model.PERMISSION_CREATE_POST.Id, - model.PERMISSION_EDIT_POST.Id, model.PERMISSION_USE_SLASH_COMMANDS.Id, model.PERMISSION_EDIT_OTHERS_POSTS.Id, model.PERMISSION_REMOVE_USER_FROM_TEAM.Id, @@ -379,6 +378,7 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) { model.PERMISSION_MANAGE_SLASH_COMMANDS.Id, model.PERMISSION_MANAGE_OTHERS_SLASH_COMMANDS.Id, model.PERMISSION_MANAGE_WEBHOOKS.Id, + model.PERMISSION_EDIT_POST.Id, }, } -- cgit v1.2.3-1-g7c22