[MM-61302] Use model.NewPointer throughout the code base (#28957)

Этот коммит содержится в:
Ben Schumacher
2024-10-29 13:29:53 +01:00
коммит произвёл GitHub
родитель 97c7c25820
Коммит 2424358b7d
10 изменённых файлов: 804 добавлений и 849 удалений

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

@@ -204,9 +204,9 @@ func TestPatchBot(t *testing.T) {
th.TestForSystemAdminAndLocal(t, func(t *testing.T, client *model.Client4) {
botPatch := &model.BotPatch{
Username: sToP(GenerateTestUsername()),
DisplayName: sToP("an updated bot"),
Description: sToP("updated bot"),
Username: model.NewPointer(GenerateTestUsername()),
DisplayName: model.NewPointer("an updated bot"),
Description: model.NewPointer("updated bot"),
}
patchedBot, patchResp, err2 := client.PatchBot(context.Background(), createdBot.UserId, botPatch)
require.NoError(t, err2)
@@ -231,9 +231,9 @@ func TestPatchBot(t *testing.T) {
th.TestForSystemAdminAndLocal(t, func(t *testing.T, client *model.Client4) {
botPatch := &model.BotPatch{
Username: sToP(GenerateTestUsername()),
DisplayName: sToP("an updated bot"),
Description: sToP("updated bot"),
Username: model.NewPointer(GenerateTestUsername()),
DisplayName: model.NewPointer("an updated bot"),
Description: model.NewPointer("updated bot"),
}
patchedBot, patchResp, err := client.PatchBot(context.Background(), createdBotSystemAdmin.UserId, botPatch)
require.NoError(t, err)
@@ -323,9 +323,9 @@ func TestPatchBot(t *testing.T) {
}()
botPatch := &model.BotPatch{
Username: sToP(GenerateTestUsername()),
DisplayName: sToP("an updated bot"),
Description: sToP("updated bot"),
Username: model.NewPointer(GenerateTestUsername()),
DisplayName: model.NewPointer("an updated bot"),
Description: model.NewPointer("updated bot"),
}
patchedBot, resp, err := th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -379,9 +379,9 @@ func TestPatchBot(t *testing.T) {
}()
botPatch := &model.BotPatch{
Username: sToP(GenerateTestUsername()),
DisplayName: sToP("an updated bot"),
Description: sToP("updated bot"),
Username: model.NewPointer(GenerateTestUsername()),
DisplayName: model.NewPointer("an updated bot"),
Description: model.NewPointer("updated bot"),
}
_, _, err = th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -414,9 +414,9 @@ func TestPatchBot(t *testing.T) {
}()
botPatch := &model.BotPatch{
Username: sToP(GenerateTestUsername()),
DisplayName: sToP("an updated bot"),
Description: sToP("updated bot"),
Username: model.NewPointer(GenerateTestUsername()),
DisplayName: model.NewPointer("an updated bot"),
Description: model.NewPointer("updated bot"),
}
_, _, err = th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -449,9 +449,9 @@ func TestPatchBot(t *testing.T) {
}()
botPatch := &model.BotPatch{
Username: sToP(GenerateTestUsername()),
DisplayName: sToP("an updated bot"),
Description: sToP("updated bot"),
Username: model.NewPointer(GenerateTestUsername()),
DisplayName: model.NewPointer("an updated bot"),
Description: model.NewPointer("updated bot"),
}
patchedBot, resp, err := th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -491,7 +491,7 @@ func TestPatchBot(t *testing.T) {
}()
botPatch := &model.BotPatch{
Username: sToP(GenerateTestUsername()),
Username: model.NewPointer(GenerateTestUsername()),
}
patchedBot, resp, err := th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -1546,7 +1546,3 @@ func TestConvertBotToUser(t *testing.T) {
CheckNotFoundStatus(t, resp)
})
}
func sToP(s string) *string {
return &s
}

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

@@ -273,7 +273,7 @@ func TestUpdateConfig(t *testing.T) {
require.Equal(t, nonEmptyURL, *cfg.ServiceSettings.SiteURL)
// Check that the Site URL can't be cleared
cfg.ServiceSettings.SiteURL = sToP("")
cfg.ServiceSettings.SiteURL = model.NewPointer("")
cfg, resp, err = th.SystemAdminClient.UpdateConfig(context.Background(), cfg)
require.Error(t, err)
CheckBadRequestStatus(t, resp)