2c3e289509
* Working on refactoring jobs service * Making more consistent with the previous existing code * Remove no longer needed functions * Making a base PeridicScheduler to use it in most of the schedulers implementations * Removing accidental complexity from on of the jobs * Removing accidental complexity from expirynotify * Fixing compilation from previous commit * Remove accidental complexity from the export_delete job * Simplifying the workers by making a reusable worker * Using simple worker for export_delete job * Simpliying export process job * Simpliying extract content job * Simpliying import delete job * Simpliying import process job * Simpliying product noticies job * Simpliying fix crt channel unreads job (only removing the uneeded register function) * Simpliying migrations job (only removing the uneeded register function) * fixup * Simpliying plugins job (only removing the uneeded register function) * Simpliying bleve indexing job (only removing the uneeded register function) * Simpliying resend invitation email job (only removing the uneeded register function) * Fixing tests * Simplifying migration tests infrastructure * Adding missed license to files * Adding an empty file to imports package to ensure this package exist even without enterprise repo * Regenerating einterfaces mocks * Adding missed license to files * Updating i18n/en.json file * help fixing enterprise tests compilation * Adding new DailyScheduler * Fixing typo and changing the waitTime type for periodic sechduler * Making the daily scheduler more generic * Adding comments to clarify not used parameters in interface scheduler interface implementations * Using merror to handle multiple errors in jobs workers * Fixing linter errors * Addressing PR review comments * Reverting go.tools.mod changes * Removing the static check for worker type in the model (moving it to the insertion of new jobs * Moving migrations job to the jobs directory * Fixing (and improving a bit) tests * Apply suggestions from code review Co-authored-by: Doug Lauder <wiggin77@warpmail.net> * Fixing enterprise tests * Removing unneeded InitWorkers/InitSchedulers calls * Fix expirenotify job when error happens * Fixing govet errors Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
81 строка
2.3 KiB
Go
81 строка
2.3 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package app
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/mattermost/mattermost-server/v6/model"
|
|
)
|
|
|
|
func TestNotifySessionsExpired(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
handler := &testPushNotificationHandler{t: t}
|
|
pushServer := httptest.NewServer(
|
|
http.HandlerFunc(handler.handleReq),
|
|
)
|
|
defer pushServer.Close()
|
|
|
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
|
*cfg.EmailSettings.PushNotificationServer = pushServer.URL
|
|
})
|
|
|
|
t.Run("push notifications disabled", func(t *testing.T) {
|
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
|
*cfg.EmailSettings.SendPushNotifications = false
|
|
})
|
|
|
|
err := th.App.NotifySessionsExpired()
|
|
// no error, but also no requests sent
|
|
require.NoError(t, err)
|
|
require.Equal(t, 0, handler.numReqs())
|
|
})
|
|
|
|
t.Run("two sessions expired", func(t *testing.T) {
|
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
|
*cfg.EmailSettings.SendPushNotifications = true
|
|
})
|
|
|
|
data := []struct {
|
|
deviceID string
|
|
expiresAt int64
|
|
notified bool
|
|
}{
|
|
{deviceID: "android:11111", expiresAt: model.GetMillis() + 100000, notified: false},
|
|
{deviceID: "android:22222", expiresAt: model.GetMillis() - 1000, notified: false},
|
|
{deviceID: "android:33333", expiresAt: model.GetMillis() - 2000, notified: false},
|
|
{deviceID: "android:44444", expiresAt: model.GetMillis() - 3000, notified: true},
|
|
}
|
|
|
|
for _, d := range data {
|
|
_, err := th.App.CreateSession(&model.Session{
|
|
UserId: th.BasicUser.Id,
|
|
DeviceId: d.deviceID,
|
|
ExpiresAt: d.expiresAt,
|
|
ExpiredNotify: d.notified,
|
|
})
|
|
require.Nil(t, err)
|
|
}
|
|
|
|
err := th.App.NotifySessionsExpired()
|
|
require.NoError(t, err)
|
|
require.Equal(t, 2, handler.numReqs())
|
|
|
|
expected := []string{"22222", "33333"}
|
|
require.Equal(t, model.PushTypeSession, handler.notifications()[0].Type)
|
|
require.Contains(t, expected, handler.notifications()[0].DeviceId)
|
|
require.Contains(t, handler.notifications()[0].Message, "Session Expired")
|
|
|
|
require.Equal(t, model.PushTypeSession, handler.notifications()[1].Type)
|
|
require.Contains(t, expected, handler.notifications()[1].DeviceId)
|
|
require.Contains(t, handler.notifications()[1].Message, "Session Expired")
|
|
})
|
|
}
|