* [MM-28779] Fix errcheck issues in server/channels/app/brand.go Remove brand.go from the errcheck exclusion list in .golangci.yml and fixed the error by properly handling the return value from a.MoveFile(). 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * [MM-28779] Add test to verify brand image backup functionality Add a new test that verifies backup of the original brand image happens when a new one is uploaded. This helps to ensure the fix for errcheck issues is working as expected. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * use seperate temporary filestore for each test * Use FileSettings.Directory instead of finding the dir programatically * Fix another test * Fix defer * Update server/channels/api4/job_test.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix bad bot commit * Cleanup logs message * cleanup file path * Fix error variable names * WIP:cleanup panic ussage * Revert "WIP:cleanup panic ussage" This reverts commit c3284e4427a41c818acc161926cd2535dee9a6b9. * cleanup error checks --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Mattermost Build <build@mattermost.com>
165 строки
5.6 KiB
Go
165 строки
5.6 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
package api4
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/mattermost/mattermost/server/public/model"
|
|
)
|
|
|
|
func TestNotifyAdmin(t *testing.T) {
|
|
t.Run("error when notifying with empty data", func(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
statusCode, err := th.Client.NotifyAdmin(context.Background(), nil)
|
|
|
|
require.Error(t, err)
|
|
require.Equal(t, http.StatusBadRequest, statusCode)
|
|
})
|
|
|
|
t.Run("error when plan is unknown when notifying on upgrade", func(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
statusCode, err := th.Client.NotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{
|
|
RequiredPlan: "Unknown plan",
|
|
RequiredFeature: model.PaidFeatureAllProfessionalfeatures,
|
|
})
|
|
|
|
require.Error(t, err)
|
|
require.Equal(t, "Unable to save notify data.", err.Error())
|
|
require.Equal(t, http.StatusInternalServerError, statusCode)
|
|
})
|
|
|
|
t.Run("error when plan is unknown when notifying to trial", func(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
statusCode, err := th.Client.NotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{
|
|
RequiredPlan: "Unknown plan",
|
|
RequiredFeature: model.PaidFeatureAllProfessionalfeatures,
|
|
TrialNotification: true,
|
|
})
|
|
|
|
require.Error(t, err)
|
|
require.Equal(t, "Unable to save notify data.", err.Error())
|
|
require.Equal(t, http.StatusInternalServerError, statusCode)
|
|
})
|
|
|
|
t.Run("error when feature is unknown when notifying on upgrade", func(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
statusCode, err := th.Client.NotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{
|
|
RequiredPlan: model.LicenseShortSkuProfessional,
|
|
RequiredFeature: "Unknown feature",
|
|
})
|
|
|
|
require.Error(t, err)
|
|
require.Equal(t, "Unable to save notify data.", err.Error())
|
|
require.Equal(t, http.StatusInternalServerError, statusCode)
|
|
})
|
|
|
|
t.Run("error when feature is unknown when notifying to trial", func(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
statusCode, err := th.Client.NotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{
|
|
RequiredPlan: model.LicenseShortSkuProfessional,
|
|
RequiredFeature: "Unknown feature",
|
|
TrialNotification: true,
|
|
})
|
|
|
|
require.Error(t, err)
|
|
require.Equal(t, "Unable to save notify data.", err.Error())
|
|
require.Equal(t, http.StatusInternalServerError, statusCode)
|
|
})
|
|
|
|
t.Run("error when user tries to notify again on same feature within the cool off period", func(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
statusCode, err := th.Client.NotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{
|
|
RequiredPlan: model.LicenseShortSkuProfessional,
|
|
RequiredFeature: model.PaidFeatureAllProfessionalfeatures,
|
|
})
|
|
require.NoError(t, err)
|
|
require.Equal(t, http.StatusOK, statusCode)
|
|
|
|
// second attempt to notify for all professional features
|
|
statusCode, err = th.Client.NotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{
|
|
RequiredPlan: model.LicenseShortSkuProfessional,
|
|
RequiredFeature: model.PaidFeatureAllProfessionalfeatures,
|
|
})
|
|
require.Error(t, err)
|
|
|
|
require.Equal(t, "Already notified admin", err.Error())
|
|
require.Equal(t, http.StatusForbidden, statusCode)
|
|
})
|
|
|
|
t.Run("successfully save upgrade notification", func(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
statusCode, err := th.Client.NotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{
|
|
RequiredPlan: model.LicenseShortSkuProfessional,
|
|
RequiredFeature: model.PaidFeatureAllProfessionalfeatures,
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
require.Equal(t, http.StatusOK, statusCode)
|
|
})
|
|
}
|
|
|
|
func TestTriggerNotifyAdmin(t *testing.T) {
|
|
t.Run("error when EnableAPITriggerAdminNotifications is not true", func(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableAPITriggerAdminNotifications = false })
|
|
|
|
statusCode, err := th.SystemAdminClient.TriggerNotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{})
|
|
|
|
require.Error(t, err)
|
|
require.Equal(t, "Internal error during cloud api request.", err.Error())
|
|
require.Equal(t, http.StatusForbidden, statusCode)
|
|
})
|
|
|
|
t.Run("error when non admins try to trigger notifications", func(t *testing.T) {
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableAPITriggerAdminNotifications = true })
|
|
|
|
statusCode, err := th.Client.TriggerNotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{})
|
|
|
|
require.Error(t, err)
|
|
require.Equal(t, "You do not have the appropriate permissions.", err.Error())
|
|
require.Equal(t, http.StatusForbidden, statusCode)
|
|
})
|
|
|
|
t.Run("happy path", func(t *testing.T) {
|
|
th := Setup(t)
|
|
defer th.TearDown()
|
|
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableAPITriggerAdminNotifications = true })
|
|
|
|
statusCode, err := th.Client.NotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{
|
|
RequiredPlan: model.LicenseShortSkuProfessional,
|
|
RequiredFeature: model.PaidFeatureAllProfessionalfeatures,
|
|
})
|
|
require.NoError(t, err)
|
|
require.Equal(t, http.StatusOK, statusCode)
|
|
|
|
statusCode, err = th.SystemAdminClient.TriggerNotifyAdmin(context.Background(), &model.NotifyAdminToUpgradeRequest{})
|
|
require.NoError(t, err)
|
|
require.Equal(t, http.StatusOK, statusCode)
|
|
})
|
|
}
|