diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
commit | d3e14a1bf86ac6148e09f888384cb46c61f23cdc (patch) | |
tree | 1c634c90166964f5184cb1ebd20ffb8ed209b120 /app/app_test.go | |
parent | 60cf74352f13874a7d07c609c03b1c763af19cea (diff) | |
parent | c1853c7f40dd67c49524c8ea884ab61883a6abdd (diff) | |
download | chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.gz chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.bz2 chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/app_test.go')
-rw-r--r-- | app/app_test.go | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/app/app_test.go b/app/app_test.go index ccf7faeeb..cb6917073 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -426,4 +426,32 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) { assert.Nil(t, err) assert.Equal(t, permissions, role.Permissions) } + + // Check that the config setting for "always" and "time_limit" edit posts is updated correctly. + th.ResetRoleMigration() + + config := th.App.GetConfig() + *config.ServiceSettings.AllowEditPost = "always" + *config.ServiceSettings.PostEditTimeLimit = 300 + th.App.SaveConfig(config, false) + + th.App.DoAdvancedPermissionsMigration() + config = th.App.GetConfig() + assert.Equal(t, -1, *config.ServiceSettings.PostEditTimeLimit) + + th.ResetRoleMigration() + + config = th.App.GetConfig() + *config.ServiceSettings.AllowEditPost = "time_limit" + *config.ServiceSettings.PostEditTimeLimit = 300 + th.App.SaveConfig(config, false) + + th.App.DoAdvancedPermissionsMigration() + config = th.App.GetConfig() + assert.Equal(t, 300, *config.ServiceSettings.PostEditTimeLimit) + + config = th.App.GetConfig() + *config.ServiceSettings.AllowEditPost = "always" + *config.ServiceSettings.PostEditTimeLimit = 300 + th.App.SaveConfig(config, false) } |