mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
* ci: shard server Postgres tests into 4 parallel runners (#35739) Cherry-pick of00296f9b49from master. * updated go to version 1.25.8 (#35817) Cherry-pick of32a10bac62from master. * Move password hashers from server/v8 to server/public (#35805) Cherry-pick ofcca3f08574from master. * Generate instead of hard-coding test passwords, enforce new minimum for FIPS, shard CI, fix FIPS builds (#35905) Cherry-pick of1bdd985b41from master. * upgrade golangci-lint (#35845) Cherry-pick of157e0400b2from master. On release-11.4 (unlike 11.5), UpdatePostsChannelTypeByChannelId and BackfillPostsChannelType exist in the elasticsearch/opensearch files, so the imports they require (fmt, updatebyquery, scriptlanguage) must be added — they were not in the cherry-pick diff since they already existed on master. Also updates html2text/tablewriter/olekukonko deps to fix a workspace conflict where enterprise's Go 1.25.8 bump pulled in a newer html2text that requires tablewriter ≥ 1.1 (was pinned to 0.0.5 via a replace directive). Matches the subset of866f759e4b(Mm 66662 bump deps) relevant to this incompatibility. * Fix FIPS-incompatible passwords and config in e2e test suites (#36001) Cherry-pick ofb51b4a8937from master. release-11.4 differences vs release-11.5: - demo_plugin_installation.spec.ts also deleted (modify/delete conflict, git rm) - authentication_2_spec.ts conflict: HEAD missing check() call; took incoming (check + FIPS-length passwords) - member_invitation_ui_spec.ts: HEAD has 'Create Account' (capital A) matching release-11.4 button text; kept HEAD's button text with incoming's newTestPassword() * fix(cypress): demo plugin (#36056) Cherry-pick of39f1979aa5from master. demo_plugin_installation.spec.ts was deleted in step 10 (modify/delete); re-created here with both the FIPS-password change and the URL fix. * test: clean up channel store data after TestChannelStore (#36066) TestChannelStore sub-tests create channels, members, and team members using fake TeamIds and UserIds (model.NewId() for non-existent rows). These records are left in the database and cause integrity tests (TestCheck*) running in the same binary to fail their full-table scans. Register a t.Cleanup on TestChannelStore that purges the affected tables entirely. A blanket purge is safe: the schema enforces no FK constraints, and every test suite creates its own data independently. * Fix command injection in server-test-template workflow (#36080) Cherry-pick of9223935f16from master. * fix(ci): restore testname format in sharded gotestsum runs (#36078) run-shard-tests.sh called gotestsum directly without --format, so it fell back to gotestsum's default (pkgname) instead of the testname format set by the Makefile. Pass --format "${GOTESTSUM_FORMAT:-testname}" to match the Makefile default. Co-authored-by: Mattermost Build <[email protected]> * fixup: drop demo_plugin playwright specs — master-only APIs demo_plugin/helpers.ts and demo_plugin_installation.spec.ts use installAndEnablePlugin and isPluginActive which don't exist on release-11.4's PlaywrightExtended type. These files were re-created by the step-11 cherry-pick of39f1979aa5, but they don't compile on this branch (same class of problem as actions.spec.ts in step 10). * fixup: add missing await in PluginLinkTooltip test The test added in39f1979aa5is missing an await on renderWithContext, causing the pointer-events assertion to race. Fix from 0c7d3f27c6 (on a feature branch, not yet on master). * fixup: drop pointer-events test incompatible with jsdom@20 The 'should not block interaction with elements outside the tooltip' test checks getComputedStyle for pointer-events: none, which is set only in SCSS. release-11.4 uses jest-environment-jsdom@29 (jsdom@20), which does not apply stylesheets, so getComputedStyle always returns "". The test passes on release-11.5+ only because they use jest-environment-jsdom@30 (jsdom@25+). Drop the test rather than backport the jsdom upgrade. * fixup: add missing i18n keys for elasticsearch/opensearch functions BackfillPostsChannelType and UpdatePostsChannelTypeByChannelId exist on release-11.4 (unlike release-11.5+). The golangci-lint cherry-pick added new error strings to those functions referencing i18n keys that weren't in en.json. * fixup: run make i18n-extract to reorder keys correctly * fixup: drop terms-and-privacy checkbox from MM-T1774 on release-11.4 The #signup-body-card-form-check-terms-and-privacy element did not exist on release-11.4's signup page. It was added to master after this branch was cut, so the check() call from the incoming cherry-pick causes the test to fail with "element never found". * fixup: remove UpdatePostsChannelTypeByChannelId/BackfillPostsChannelType These functions were introduced by MM-67540 (allow searching public channel messages without channel membership), which never landed on release-11.4. The golangci-lint cherry-pick only modernizes existing code; the rerere resolution incorrectly added the full function bodies from master. Remove both functions and their now-unused imports (fmt, updatebyquery, scriptlanguage) from elasticsearch.go and opensearch.go. Also remove the two i18n keys added to support them. Same treatment as release-11.5, where these functions were also absent. --------- Co-authored-by: Mattermost Build <[email protected]>
193 lines
6.2 KiB
Go
193 lines
6.2 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package platform
|
|
|
|
import (
|
|
"errors"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/mattermost/mattermost/server/public/model"
|
|
smocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
|
|
"github.com/mattermost/mattermost/server/v8/einterfaces/mocks"
|
|
)
|
|
|
|
func TestConfigListener(t *testing.T) {
|
|
mainHelper.Parallel(t)
|
|
th := Setup(t)
|
|
|
|
originalSiteName := th.Service.Config().TeamSettings.SiteName
|
|
|
|
listenerCalled := false
|
|
listener := func(oldConfig *model.Config, newConfig *model.Config) {
|
|
assert.False(t, listenerCalled, "listener called twice")
|
|
|
|
assert.Equal(t, *originalSiteName, *oldConfig.TeamSettings.SiteName, "old config contains incorrect site name")
|
|
assert.Equal(t, "test123", *newConfig.TeamSettings.SiteName, "new config contains incorrect site name")
|
|
|
|
listenerCalled = true
|
|
}
|
|
listenerId := th.Service.AddConfigListener(listener)
|
|
defer th.Service.RemoveConfigListener(listenerId)
|
|
|
|
listener2Called := false
|
|
listener2 := func(oldConfig *model.Config, newConfig *model.Config) {
|
|
assert.False(t, listener2Called, "listener2 called twice")
|
|
|
|
listener2Called = true
|
|
}
|
|
listener2Id := th.Service.AddConfigListener(listener2)
|
|
defer th.Service.RemoveConfigListener(listener2Id)
|
|
|
|
th.Service.UpdateConfig(func(cfg *model.Config) {
|
|
*cfg.TeamSettings.SiteName = "test123"
|
|
})
|
|
|
|
assert.True(t, listenerCalled, "listener should've been called")
|
|
assert.True(t, listener2Called, "listener 2 should've been called")
|
|
}
|
|
|
|
func TestConfigSave(t *testing.T) {
|
|
mainHelper.Parallel(t)
|
|
cm := &mocks.ClusterInterface{}
|
|
cm.On("SendClusterMessage", mock.AnythingOfType("*model.ClusterMessage")).Return(nil)
|
|
th := SetupWithCluster(t, cm)
|
|
|
|
t.Run("trigger a config changed event for the cluster", func(t *testing.T) {
|
|
oldCfg := th.Service.Config()
|
|
newCfg := oldCfg.Clone()
|
|
newCfg.ServiceSettings.SiteURL = model.NewPointer("http://newhost.me")
|
|
|
|
sanitizedOldCfg := th.Service.configStore.RemoveEnvironmentOverrides(oldCfg)
|
|
sanitizedNewCfg := th.Service.configStore.RemoveEnvironmentOverrides(newCfg)
|
|
cm.On("ConfigChanged", sanitizedOldCfg, sanitizedNewCfg, true).Return(nil)
|
|
|
|
_, _, appErr := th.Service.SaveConfig(newCfg, true)
|
|
require.Nil(t, appErr)
|
|
|
|
updatedCfg := th.Service.Config()
|
|
assert.Equal(t, "http://newhost.me", *updatedCfg.ServiceSettings.SiteURL)
|
|
})
|
|
|
|
t.Run("do not restart the metrics server on a different type of config change", func(t *testing.T) {
|
|
th := Setup(t, StartMetrics())
|
|
|
|
metricsMock := &mocks.MetricsInterface{}
|
|
metricsMock.On("IncrementWebsocketEvent", model.WebsocketEventConfigChanged).Return()
|
|
metricsMock.On("IncrementWebSocketBroadcastBufferSize", mock.AnythingOfType("string"), mock.AnythingOfType("float64")).Return()
|
|
metricsMock.On("DecrementWebSocketBroadcastBufferSize", mock.AnythingOfType("string"), mock.AnythingOfType("float64")).Return()
|
|
metricsMock.On("Register").Return()
|
|
th.Service.metricsIFace = metricsMock
|
|
|
|
// Change a random config setting
|
|
cfg := th.Service.Config().Clone()
|
|
cfg.ThemeSettings.EnableThemeSelection = model.NewPointer(!*cfg.ThemeSettings.EnableThemeSelection)
|
|
_, _, appErr := th.Service.SaveConfig(cfg, false)
|
|
require.Nil(t, appErr)
|
|
metricsMock.AssertNumberOfCalls(t, "Register", 0)
|
|
|
|
// Disable metrics
|
|
cfg.MetricsSettings.Enable = model.NewPointer(false)
|
|
_, _, appErr = th.Service.SaveConfig(cfg, false)
|
|
require.Nil(t, appErr)
|
|
|
|
// Change the metrics setting
|
|
cfg.MetricsSettings.Enable = model.NewPointer(true)
|
|
_, _, appErr = th.Service.SaveConfig(cfg, false)
|
|
require.Nil(t, appErr)
|
|
metricsMock.AssertNumberOfCalls(t, "Register", 1)
|
|
})
|
|
}
|
|
|
|
func TestIsFirstUserAccount(t *testing.T) {
|
|
mainHelper.Parallel(t)
|
|
th := SetupWithStoreMock(t)
|
|
storeMock := th.Service.Store.(*smocks.Store)
|
|
userStoreMock := &smocks.UserStore{}
|
|
storeMock.On("User").Return(userStoreMock)
|
|
|
|
type test struct {
|
|
name string
|
|
count int64
|
|
err error
|
|
result bool
|
|
shouldCallStore bool
|
|
}
|
|
|
|
tests := []test{
|
|
{"failed request", 0, errors.New("error"), false, true},
|
|
{"success negative users", -100, nil, true, true},
|
|
{"success no users", 0, nil, true, true},
|
|
{"success one user", 1, nil, false, true},
|
|
{"success multiple users - no store call", 42, nil, false, false},
|
|
}
|
|
|
|
// create a session, this should not affect IsFirstUserAccount
|
|
err := th.Service.sessionCache.SetWithDefaultExpiry("mock_session", 1)
|
|
require.NoError(t, err)
|
|
|
|
for _, te := range tests {
|
|
t.Run(te.name, func(t *testing.T) {
|
|
*userStoreMock = smocks.UserStore{}
|
|
|
|
if te.shouldCallStore {
|
|
userStoreMock.On("Count", model.UserCountOptions{IncludeDeleted: true}).Return(te.count, te.err).Once()
|
|
} else {
|
|
userStoreMock.On("Count", model.UserCountOptions{IncludeDeleted: true}).Unset()
|
|
}
|
|
|
|
require.Equal(t, te.result, th.Service.IsFirstUserAccount())
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIsFirstUserAccountThunderingHerd(t *testing.T) {
|
|
mainHelper.Parallel(t)
|
|
th := SetupWithStoreMock(t)
|
|
storeMock := th.Service.Store.(*smocks.Store)
|
|
userStoreMock := &smocks.UserStore{}
|
|
storeMock.On("User").Return(userStoreMock)
|
|
|
|
tests := []struct {
|
|
name string
|
|
count int64
|
|
err error
|
|
concurrentRequest int
|
|
result bool
|
|
numberOfStoreCalls int
|
|
}{
|
|
{"failed request", 0, errors.New("error"), 10, false, 10},
|
|
{"success negative users", -100, nil, 10, true, 10},
|
|
{"success no users", 0, nil, 10, true, 10},
|
|
{"success one user - lot of requests", 1, nil, 1000, false, 1},
|
|
{"success multiple users - no store call", 42, nil, 10, false, 0},
|
|
}
|
|
|
|
for _, te := range tests {
|
|
t.Run(te.name, func(t *testing.T) {
|
|
*userStoreMock = smocks.UserStore{}
|
|
|
|
if te.numberOfStoreCalls != 0 {
|
|
userStoreMock.On("Count", model.UserCountOptions{IncludeDeleted: true}).Return(te.count, te.err).Times(te.numberOfStoreCalls)
|
|
} else {
|
|
userStoreMock.On("Count", model.UserCountOptions{IncludeDeleted: true}).Unset()
|
|
}
|
|
defer userStoreMock.AssertExpectations(t)
|
|
|
|
var wg sync.WaitGroup
|
|
for i := 0; i < te.concurrentRequest; i++ {
|
|
wg.Go(func() {
|
|
require.Equal(t, te.result, th.Service.IsFirstUserAccount())
|
|
})
|
|
}
|
|
|
|
wg.Wait()
|
|
})
|
|
}
|
|
}
|