IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-10 04:58:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

MM-68532: default EnableSearchPublicChannelsWithoutMembership to true for new installations (#36399)

Browse Source 
* MM-68532: default EnableSearchPublicChannelsWithoutMembership to true for new installations

* fix test: disable backfill in watcher tests to avoid mock store panic

* fix test: mock System store so backfill returns early in watcher tests

* MM-68532: add SetDefaults unit test for EnableSearchPublicChannelsWithoutMembership
This commit is contained in:
Jesse Hallam
2026-05-06 09:13:58 -04:00
committed by GitHub
parent 5124cc7387
commit 97c3b53873
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/channels/app/platform/searchengine_test.go
+9
View File
@@ -18,6 +18,7 @@ import (
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/public/shared/request"
storemocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
"github.com/mattermost/mattermost/server/v8/channels/testlib"
"github.com/mattermost/mattermost/server/v8/platform/services/searchengine"
searchenginemocks "github.com/mattermost/mattermost/server/v8/platform/services/searchengine/mocks"
@@ -64,6 +65,14 @@ func setupWatcherTest(t *testing.T) (*searchEngineWatcher, *searchenginemocks.Se
engineMock.On("IsHealthy").Return(true).Maybe()
engineMock.On("SetHealthy", mock.Anything).Maybe()
// Make backfillPostsChannelType return immediately by indicating the backfill
// is already done. This prevents the goroutine from calling unmocked store
// methods in tests that only exercise watcher retry/health logic.
systemMock := &storemocks.SystemStore{}
systemMock.On("GetByName", model.SystemPostChannelTypeBackfillComplete).
Return(&model.System{Name: model.SystemPostChannelTypeBackfillComplete, Value: "true"}, nil).Maybe()
ps.Store.(*storemocks.Store).On("System").Return(systemMock).Maybe()
ps.SearchEngine = searchengine.NewBroker(ps.Config())
ps.SearchEngine.ElasticsearchEngine = engineMock
server/public/model/config.go
+1 -1
View File
@@ -3273,7 +3273,7 @@ func (s *ElasticsearchSettings) SetDefaults() {
}
if s.EnableSearchPublicChannelsWithoutMembership == nil {
s.EnableSearchPublicChannelsWithoutMembership = NewPointer(false)
s.EnableSearchPublicChannelsWithoutMembership = NewPointer(true)
}
}
server/public/model/config_test.go
+14
View File
@@ -3001,3 +3001,17 @@ func TestExperimentalSettingsEnableWatermarkDefault(t *testing.T) {
require.True(t, *cfg.ExperimentalSettings.EnableWatermark)
})
}
func TestElasticsearchSettingsSetDefaults(t *testing.T) {
t.Run("EnableSearchPublicChannelsWithoutMembership defaults to true when nil", func(t *testing.T) {
s := ElasticsearchSettings{}
s.SetDefaults()
require.True(t, *s.EnableSearchPublicChannelsWithoutMembership)
})
t.Run("EnableSearchPublicChannelsWithoutMembership preserves explicit false", func(t *testing.T) {
s := ElasticsearchSettings{EnableSearchPublicChannelsWithoutMembership: NewPointer(false)}
s.SetDefaults()
require.False(t, *s.EnableSearchPublicChannelsWithoutMembership)
})
}