Migrate to stateless app.App (#17542)
* add request context * move initialialization to server * use app interface instead of global app functions * remove app context from webconn * cleanup * remove duplicated services * move context to separate package * remove finalize init method and move content to NewServer function * restart workers and schedulers after adding license for tests * reflect review comments Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c09369f14a
Коммит
5ea06e51d0
@@ -11,6 +11,7 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/app/request"
|
||||
"github.com/mattermost/mattermost-server/v5/model"
|
||||
"github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock"
|
||||
"github.com/mattermost/mattermost-server/v5/store/storetest/mocks"
|
||||
@@ -41,7 +42,8 @@ func TestCloudKeyRequired(t *testing.T) {
|
||||
th.App.Srv().SetLicense(model.NewTestLicense("cloud"))
|
||||
|
||||
c := &Context{
|
||||
App: th.App,
|
||||
App: th.App,
|
||||
AppContext: &request.Context{},
|
||||
}
|
||||
|
||||
c.CloudKeyRequired()
|
||||
@@ -69,7 +71,7 @@ func TestMfaRequired(t *testing.T) {
|
||||
|
||||
th.App.Srv().SetLicense(model.NewTestLicense("mfa"))
|
||||
|
||||
th.App.SetSession(&model.Session{Id: "abc", UserId: "userid"})
|
||||
th.Context.SetSession(&model.Session{Id: "abc", UserId: "userid"})
|
||||
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.AnnouncementSettings.UserNoticesEnabled = false
|
||||
@@ -79,7 +81,8 @@ func TestMfaRequired(t *testing.T) {
|
||||
})
|
||||
|
||||
c := &Context{
|
||||
App: th.App,
|
||||
App: th.App,
|
||||
AppContext: th.Context,
|
||||
}
|
||||
|
||||
c.MfaRequired()
|
||||
|
||||
Ссылка в новой задаче
Block a user