diff options
author | Jesús Espino <jespinog@gmail.com> | 2018-05-29 16:58:12 +0200 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-05-29 15:58:12 +0100 |
commit | e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8 (patch) | |
tree | 480a5b91b37e2728ea151e3b7ad521aaf4402697 /app/apptestlib.go | |
parent | bf4cefc3496686850757b2d44219ea2425871dda (diff) | |
download | chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.tar.gz chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.tar.bz2 chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.zip |
MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)
* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions
* MM-8853: Removing unnecesary emoji enterprise feature
* Create emojis migration
* Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS always to system admins
* Simplifing permissions checks
* Revert "Simplifing permissions checks"
This reverts commit e2cafc1905fc9e20125dd9a1552d2d0c7340ae59.
Diffstat (limited to 'app/apptestlib.go')
-rw-r--r-- | app/apptestlib.go | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/apptestlib.go b/app/apptestlib.go index ec4992a75..d4a79bdcc 100644 --- a/app/apptestlib.go +++ b/app/apptestlib.go @@ -110,6 +110,7 @@ func setupTestHelper(enterprise bool) *TestHelper { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = prevListenAddress }) th.App.DoAdvancedPermissionsMigration() + th.App.DoEmojisPermissionsMigration() th.App.Srv.Store.MarkSystemRanUnitTests() @@ -433,6 +434,18 @@ func (me *TestHelper) ResetRoleMigration() { } } +func (me *TestHelper) ResetEmojisMigration() { + if _, err := testStoreSqlSupplier.GetMaster().Exec("UPDATE Roles SET Permissions=REPLACE(Permissions, ', manage_emojis', '') WHERE builtin=True"); err != nil { + panic(err) + } + + testClusterInterface.sendClearRoleCacheMessage() + + if _, err := testStoreSqlSupplier.GetMaster().Exec("DELETE from Systems where Name = :Name", map[string]interface{}{"Name": EMOJIS_PERMISSIONS_MIGRATION_KEY}); err != nil { + panic(err) + } +} + type FakeClusterInterface struct { clusterMessageHandler einterfaces.ClusterMessageHandler } |