mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
9ed85b6850
* 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]>
286 lines
11 KiB
Go
286 lines
11 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package email
|
|
|
|
import (
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/mattermost/mattermost/server/public/model"
|
|
)
|
|
|
|
func TestHandleNewNotifications(t *testing.T) {
|
|
mainHelper.Parallel(t)
|
|
|
|
th := SetupWithStoreMock(t)
|
|
|
|
id1 := model.NewId()
|
|
id2 := model.NewId()
|
|
id3 := model.NewId()
|
|
|
|
// test queueing of received posts by user
|
|
job := NewEmailBatchingJob(th.service, 128)
|
|
|
|
job.handleNewNotifications()
|
|
|
|
require.Empty(t, job.pendingNotifications, "shouldn't have added any pending notifications")
|
|
|
|
job.Add(&model.User{Id: id1}, &model.Post{UserId: id1, Message: "test"}, &model.Team{Name: "team"})
|
|
require.Empty(t, job.pendingNotifications, "shouldn't have added any pending notifications")
|
|
|
|
job.handleNewNotifications()
|
|
require.Len(t, job.pendingNotifications, 1, "should have received posts for 1 user")
|
|
require.Len(t, job.pendingNotifications[id1], 1, "should have received 1 post for user")
|
|
|
|
job.Add(&model.User{Id: id1}, &model.Post{UserId: id1, Message: "test"}, &model.Team{Name: "team"})
|
|
job.handleNewNotifications()
|
|
require.Len(t, job.pendingNotifications, 1, "should have received posts for 1 user")
|
|
require.Len(t, job.pendingNotifications[id1], 2, "should have received 2 posts for user1")
|
|
|
|
job.Add(&model.User{Id: id2}, &model.Post{UserId: id1, Message: "test"}, &model.Team{Name: "team"})
|
|
job.handleNewNotifications()
|
|
require.Len(t, job.pendingNotifications, 2, "should have received posts for 2 users")
|
|
require.Len(t, job.pendingNotifications[id1], 2, "should have received 2 posts for user1")
|
|
require.Len(t, job.pendingNotifications[id2], 1, "should have received 1 post for user2")
|
|
|
|
job.Add(&model.User{Id: id2}, &model.Post{UserId: id2, Message: "test"}, &model.Team{Name: "team"})
|
|
job.Add(&model.User{Id: id1}, &model.Post{UserId: id3, Message: "test"}, &model.Team{Name: "team"})
|
|
job.Add(&model.User{Id: id3}, &model.Post{UserId: id3, Message: "test"}, &model.Team{Name: "team"})
|
|
job.Add(&model.User{Id: id2}, &model.Post{UserId: id2, Message: "test"}, &model.Team{Name: "team"})
|
|
job.handleNewNotifications()
|
|
require.Len(t, job.pendingNotifications, 3, "should have received posts for 3 users")
|
|
require.Len(t, job.pendingNotifications[id1], 3, "should have received 3 posts for user1")
|
|
require.Len(t, job.pendingNotifications[id2], 3, "should have received 3 posts for user2")
|
|
require.Len(t, job.pendingNotifications[id3], 1, "should have received 1 post for user3")
|
|
|
|
// test ordering of received posts
|
|
job = NewEmailBatchingJob(th.service, 128)
|
|
|
|
job.Add(&model.User{Id: id1}, &model.Post{UserId: id1, Message: "test1"}, &model.Team{Name: "team"})
|
|
job.Add(&model.User{Id: id1}, &model.Post{UserId: id1, Message: "test2"}, &model.Team{Name: "team"})
|
|
job.Add(&model.User{Id: id2}, &model.Post{UserId: id1, Message: "test3"}, &model.Team{Name: "team"})
|
|
job.Add(&model.User{Id: id1}, &model.Post{UserId: id1, Message: "test4"}, &model.Team{Name: "team"})
|
|
job.Add(&model.User{Id: id2}, &model.Post{UserId: id1, Message: "test5"}, &model.Team{Name: "team"})
|
|
job.handleNewNotifications()
|
|
assert.Equal(t, job.pendingNotifications[id1][0].post.Message, "test1", "incorrect order of received posts for user1")
|
|
assert.Equal(t, job.pendingNotifications[id1][1].post.Message, "test2", "incorrect order of received posts for user1")
|
|
assert.Equal(t, job.pendingNotifications[id1][2].post.Message, "test4", "incorrect order of received posts for user1")
|
|
assert.Equal(t, job.pendingNotifications[id2][0].post.Message, "test3", "incorrect order of received posts for user2")
|
|
assert.Equal(t, job.pendingNotifications[id2][1].post.Message, "test5", "incorrect order of received posts for user2")
|
|
}
|
|
|
|
func TestCheckPendingNotifications(t *testing.T) {
|
|
mainHelper.Parallel(t)
|
|
th := Setup(t).InitBasic(t)
|
|
|
|
job := NewEmailBatchingJob(th.service, 128)
|
|
job.pendingNotifications[th.BasicUser.Id] = []*batchedNotification{
|
|
{
|
|
post: &model.Post{
|
|
UserId: th.BasicUser.Id,
|
|
ChannelId: th.BasicChannel.Id,
|
|
CreateAt: 10000000,
|
|
},
|
|
teamName: th.BasicTeam.Name,
|
|
},
|
|
}
|
|
|
|
channelMember, err := th.store.Channel().GetMember(th.Context, th.BasicChannel.Id, th.BasicUser.Id)
|
|
require.NoError(t, err)
|
|
channelMember.LastViewedAt = 9999999
|
|
_, err = th.store.Channel().UpdateMember(th.Context, channelMember)
|
|
require.NoError(t, err)
|
|
|
|
nErr := th.store.Preference().Save(model.Preferences{{
|
|
UserId: th.BasicUser.Id,
|
|
Category: model.PreferenceCategoryNotifications,
|
|
Name: model.PreferenceNameEmailInterval,
|
|
Value: "60",
|
|
}})
|
|
require.NoError(t, nErr)
|
|
|
|
// test that notifications aren't sent before interval
|
|
job.checkPendingNotifications(time.Unix(10001, 0), func(string, []*batchedNotification) {})
|
|
|
|
require.NotNil(t, job.pendingNotifications[th.BasicUser.Id])
|
|
require.Len(t, job.pendingNotifications[th.BasicUser.Id], 1, "shouldn't have sent queued post")
|
|
|
|
// test that notifications are cleared if the user has acted
|
|
channelMember, err = th.store.Channel().GetMember(th.Context, th.BasicChannel.Id, th.BasicUser.Id)
|
|
require.NoError(t, err)
|
|
channelMember.LastViewedAt = 10001000
|
|
_, err = th.store.Channel().UpdateMember(th.Context, channelMember)
|
|
require.NoError(t, err)
|
|
|
|
// We reset the interval to something shorter
|
|
nErr = th.store.Preference().Save(model.Preferences{{
|
|
UserId: th.BasicUser.Id,
|
|
Category: model.PreferenceCategoryNotifications,
|
|
Name: model.PreferenceNameEmailInterval,
|
|
Value: "10",
|
|
}})
|
|
require.NoError(t, nErr)
|
|
|
|
var wasCalled atomic.Int32
|
|
job.checkPendingNotifications(time.Unix(10050, 0), func(string, []*batchedNotification) {
|
|
wasCalled.Store(int32(1))
|
|
})
|
|
|
|
// A hack to check whether the handler was called.
|
|
// It's not straightforward to just wait for it using a channel because the test should
|
|
// NOT call the handler, and it will be called only if the test fails.
|
|
time.Sleep(1 * time.Second)
|
|
// We do a check outside the email handler, because otherwise, failing from
|
|
// inside the handler doesn't let the .Go() function exit cleanly, and it gets
|
|
// stuck during server shutdown, trying to wait for the goroutine to exit
|
|
require.Equal(t, int32(0), wasCalled.Load(), "email handler should not have been called")
|
|
|
|
require.Nil(t, job.pendingNotifications[th.BasicUser.Id])
|
|
require.Empty(t, job.pendingNotifications[th.BasicUser.Id], "should've remove queued post since user acted")
|
|
|
|
// test that notifications are sent if enough time passes since the first message
|
|
job.pendingNotifications[th.BasicUser.Id] = []*batchedNotification{
|
|
{
|
|
post: &model.Post{
|
|
UserId: th.BasicUser.Id,
|
|
ChannelId: th.BasicChannel.Id,
|
|
CreateAt: 10060000,
|
|
Message: "post1",
|
|
},
|
|
teamName: th.BasicTeam.Name,
|
|
},
|
|
{
|
|
post: &model.Post{
|
|
UserId: th.BasicUser.Id,
|
|
ChannelId: th.BasicChannel.Id,
|
|
CreateAt: 10090000,
|
|
Message: "post2",
|
|
},
|
|
teamName: th.BasicTeam.Name,
|
|
},
|
|
}
|
|
|
|
received := make(chan *model.Post, 2)
|
|
|
|
job.checkPendingNotifications(time.Unix(10130, 0), func(s string, notifications []*batchedNotification) {
|
|
for _, notification := range notifications {
|
|
received <- notification.post
|
|
}
|
|
})
|
|
|
|
require.Nil(t, job.pendingNotifications[th.BasicUser.Id], "shouldn't have sent queued post")
|
|
|
|
select {
|
|
case post := <-received:
|
|
require.Equal(t, post.Message, "post1", "should've received post1 first")
|
|
case <-time.After(5 * time.Second):
|
|
require.Fail(t, "timed out waiting for first post notification")
|
|
}
|
|
|
|
select {
|
|
case post := <-received:
|
|
require.Equal(t, post.Message, "post2", "should've received post2 second")
|
|
case <-time.After(5 * time.Second):
|
|
require.Fail(t, "timed out waiting for second post notification")
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Ensures that email batch interval defaults to 15 minutes for users that haven't explicitly set this preference
|
|
*/
|
|
func TestCheckPendingNotificationsDefaultInterval(t *testing.T) {
|
|
mainHelper.Parallel(t)
|
|
th := Setup(t).InitBasic(t)
|
|
|
|
job := NewEmailBatchingJob(th.service, 128)
|
|
|
|
// bypasses recent user activity check
|
|
require.NotNil(t, th.store)
|
|
require.NotNil(t, th.store.Channel())
|
|
|
|
require.NotNil(t, th.BasicUser)
|
|
require.NotNil(t, th.BasicChannel)
|
|
channelMember, err := th.store.Channel().GetMember(th.Context, th.BasicChannel.Id, th.BasicUser.Id)
|
|
require.NoError(t, err)
|
|
channelMember.LastViewedAt = 9999000
|
|
_, err = th.store.Channel().UpdateMember(th.Context, channelMember)
|
|
require.NoError(t, err)
|
|
|
|
job.pendingNotifications[th.BasicUser.Id] = []*batchedNotification{
|
|
{
|
|
post: &model.Post{
|
|
UserId: th.BasicUser.Id,
|
|
ChannelId: th.BasicChannel.Id,
|
|
CreateAt: 10000000,
|
|
},
|
|
teamName: th.BasicTeam.Name,
|
|
},
|
|
}
|
|
|
|
// notifications should not be sent 1s after post was created, because default batch interval is 15mins
|
|
job.checkPendingNotifications(time.Unix(10001, 0), func(string, []*batchedNotification) {})
|
|
require.NotNil(t, job.pendingNotifications[th.BasicUser.Id])
|
|
require.Len(t, job.pendingNotifications[th.BasicUser.Id], 1, "shouldn't have sent queued post")
|
|
|
|
// notifications should be sent 901s after post was created, because default batch interval is 15mins
|
|
job.checkPendingNotifications(time.Unix(10901, 0), func(string, []*batchedNotification) {})
|
|
require.Nil(t, job.pendingNotifications[th.BasicUser.Id])
|
|
require.Empty(t, job.pendingNotifications[th.BasicUser.Id], "should have sent queued post")
|
|
}
|
|
|
|
/**
|
|
* Ensures that email batch interval defaults to 15 minutes if user preference is invalid
|
|
*/
|
|
func TestCheckPendingNotificationsCantParseInterval(t *testing.T) {
|
|
mainHelper.Parallel(t)
|
|
th := Setup(t).InitBasic(t)
|
|
|
|
job := NewEmailBatchingJob(th.service, 128)
|
|
|
|
require.NotNil(t, th.store)
|
|
require.NotNil(t, th.store.Channel())
|
|
require.NotNil(t, th.BasicChannel)
|
|
require.NotNil(t, th.BasicUser)
|
|
// bypasses recent user activity check
|
|
channelMember, err := th.store.Channel().GetMember(th.Context, th.BasicChannel.Id, th.BasicUser.Id)
|
|
require.NoError(t, err)
|
|
channelMember.LastViewedAt = 9999000
|
|
_, err = th.store.Channel().UpdateMember(th.Context, channelMember)
|
|
require.NoError(t, err)
|
|
|
|
// preference value is not an integer, so we'll fall back to the default 15min value
|
|
nErr := th.store.Preference().Save(model.Preferences{{
|
|
UserId: th.BasicUser.Id,
|
|
Category: model.PreferenceCategoryNotifications,
|
|
Name: model.PreferenceNameEmailInterval,
|
|
Value: "notAnIntegerValue",
|
|
}})
|
|
require.NoError(t, nErr)
|
|
|
|
job.pendingNotifications[th.BasicUser.Id] = []*batchedNotification{
|
|
{
|
|
post: &model.Post{
|
|
UserId: th.BasicUser.Id,
|
|
ChannelId: th.BasicChannel.Id,
|
|
CreateAt: 10000000,
|
|
},
|
|
teamName: th.BasicTeam.Name,
|
|
},
|
|
}
|
|
|
|
// notifications should not be sent 1s after post was created, because default batch interval is 15mins
|
|
job.checkPendingNotifications(time.Unix(10001, 0), func(string, []*batchedNotification) {})
|
|
require.NotNil(t, job.pendingNotifications[th.BasicUser.Id])
|
|
require.Len(t, job.pendingNotifications[th.BasicUser.Id], 1, "shouldn't have sent queued post")
|
|
|
|
// notifications should be sent 901s after post was created, because default batch interval is 15mins
|
|
job.checkPendingNotifications(time.Unix(10901, 0), func(string, []*batchedNotification) {})
|
|
|
|
require.Nil(t, job.pendingNotifications[th.BasicUser.Id], "should have sent queued post")
|
|
}
|