Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Этот коммит содержится в:
Arya Khochare
2024-10-08 00:47:21 +05:30
коммит произвёл GitHub
родитель b8b3f9b012
Коммит 82929d86ab
2 изменённых файлов: 17 добавлений и 15 удалений

Просмотреть файл

@@ -79,7 +79,6 @@ issues:
channels/api4/export_test.go|\ channels/api4/export_test.go|\
channels/api4/file_test.go|\ channels/api4/file_test.go|\
channels/api4/group_local.go|\ channels/api4/group_local.go|\
channels/api4/handlers_test.go|\
channels/api4/import_test.go|\ channels/api4/import_test.go|\
channels/api4/integration_action_test.go|\ channels/api4/integration_action_test.go|\
channels/api4/ip_filtering_test.go|\ channels/api4/ip_filtering_test.go|\

Просмотреть файл

@@ -14,10 +14,13 @@ import (
"github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/model"
) )
func handlerForGzip(c *Context, w http.ResponseWriter, r *http.Request) { func handlerForGzip(t *testing.T) func(*Context, http.ResponseWriter, *http.Request) {
// gziphandler default requires body size greater than 1400 bytes return func(_ *Context, w http.ResponseWriter, _ *http.Request) {
var body [1400]byte // gziphandler default requires body size greater than 1400 bytes
w.Write(body[:]) var body [1400]byte
_, err := w.Write(body[:])
require.NoError(t, err)
}
} }
func testAPIHandlerGzipMode(t *testing.T, name string, h http.Handler, token string) { func testAPIHandlerGzipMode(t *testing.T, name string, h http.Handler, token string) {
@@ -76,20 +79,20 @@ func TestAPIHandlersWithGzip(t *testing.T) {
t.Run("with WebserverMode == \"gzip\"", func(t *testing.T) { t.Run("with WebserverMode == \"gzip\"", func(t *testing.T) {
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.WebserverMode = "gzip" }) th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.WebserverMode = "gzip" })
testAPIHandlerGzipMode(t, "ApiHandler", api.APIHandler(handlerForGzip), "") testAPIHandlerGzipMode(t, "ApiHandler", api.APIHandler(handlerForGzip(t)), "")
testAPIHandlerGzipMode(t, "ApiSessionRequired", api.APISessionRequired(handlerForGzip), session.Token) testAPIHandlerGzipMode(t, "ApiSessionRequired", api.APISessionRequired(handlerForGzip(t)), session.Token)
testAPIHandlerGzipMode(t, "ApiSessionRequiredMfa", api.APISessionRequiredMfa(handlerForGzip), session.Token) testAPIHandlerGzipMode(t, "ApiSessionRequiredMfa", api.APISessionRequiredMfa(handlerForGzip(t)), session.Token)
testAPIHandlerGzipMode(t, "ApiHandlerTrustRequester", api.APIHandlerTrustRequester(handlerForGzip), "") testAPIHandlerGzipMode(t, "ApiHandlerTrustRequester", api.APIHandlerTrustRequester(handlerForGzip(t)), "")
testAPIHandlerGzipMode(t, "ApiSessionRequiredTrustRequester", api.APISessionRequiredTrustRequester(handlerForGzip), session.Token) testAPIHandlerGzipMode(t, "ApiSessionRequiredTrustRequester", api.APISessionRequiredTrustRequester(handlerForGzip(t)), session.Token)
}) })
t.Run("with WebserverMode == \"nogzip\"", func(t *testing.T) { t.Run("with WebserverMode == \"nogzip\"", func(t *testing.T) {
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.WebserverMode = "nogzip" }) th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.WebserverMode = "nogzip" })
testAPIHandlerNoGzipMode(t, "ApiHandler", api.APIHandler(handlerForGzip), "") testAPIHandlerNoGzipMode(t, "ApiHandler", api.APIHandler(handlerForGzip(t)), "")
testAPIHandlerNoGzipMode(t, "ApiSessionRequired", api.APISessionRequired(handlerForGzip), session.Token) testAPIHandlerNoGzipMode(t, "ApiSessionRequired", api.APISessionRequired(handlerForGzip(t)), session.Token)
testAPIHandlerNoGzipMode(t, "ApiSessionRequiredMfa", api.APISessionRequiredMfa(handlerForGzip), session.Token) testAPIHandlerNoGzipMode(t, "ApiSessionRequiredMfa", api.APISessionRequiredMfa(handlerForGzip(t)), session.Token)
testAPIHandlerNoGzipMode(t, "ApiHandlerTrustRequester", api.APIHandlerTrustRequester(handlerForGzip), "") testAPIHandlerNoGzipMode(t, "ApiHandlerTrustRequester", api.APIHandlerTrustRequester(handlerForGzip(t)), "")
testAPIHandlerNoGzipMode(t, "ApiSessionRequiredTrustRequester", api.APISessionRequiredTrustRequester(handlerForGzip), session.Token) testAPIHandlerNoGzipMode(t, "ApiSessionRequiredTrustRequester", api.APISessionRequiredTrustRequester(handlerForGzip(t)), session.Token)
}) })
} }