[MM-43798] Change default CRT option from Disabled to AlwaysOn (#20114)
* MM-32692 Add two more CRT options * [MM-43798] Change CRT default to AlwaysOn * Rename variable * fix test Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Ashish Bhate <ashish.bhate@mattermost.com>
Этот коммит содержится в:
@@ -1152,8 +1152,10 @@ func TestClearPushNotificationSync(t *testing.T) {
|
|||||||
mockStore.On("Session").Return(&mockSessionStore)
|
mockStore.On("Session").Return(&mockSessionStore)
|
||||||
mockStore.On("GetDBSchemaVersion").Return(1, nil)
|
mockStore.On("GetDBSchemaVersion").Return(1, nil)
|
||||||
|
|
||||||
|
// When CRT is disabled
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||||
*cfg.EmailSettings.PushNotificationServer = pushServer.URL
|
*cfg.EmailSettings.PushNotificationServer = pushServer.URL
|
||||||
|
*cfg.ServiceSettings.CollapsedThreads = model.CollapsedThreadsDisabled
|
||||||
})
|
})
|
||||||
|
|
||||||
err := th.App.clearPushNotificationSync(sess1.Id, "user1", "channel1", "")
|
err := th.App.clearPushNotificationSync(sess1.Id, "user1", "channel1", "")
|
||||||
|
|||||||
@@ -827,7 +827,7 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if s.CollapsedThreads == nil {
|
if s.CollapsedThreads == nil {
|
||||||
s.CollapsedThreads = NewString(CollapsedThreadsDisabled)
|
s.CollapsedThreads = NewString(CollapsedThreadsAlwaysOn)
|
||||||
}
|
}
|
||||||
|
|
||||||
if s.ManagedResourcePaths == nil {
|
if s.ManagedResourcePaths == nil {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user