[MM-37557] Move error out of client4 response (#18101)
* Return an error seperately from Response * Remove BuildErrorResponse * Drop Response.Error from model/client4.go * Migrate require.Nil checks * Migrate require.NotNil checks * More manual fixes * Move error check out of CheckOKStatus and CheckCreatedStatus * Move error check out of CheckForbiddenStatus * Move error check out of CheckUnauthorizedStatus * Move error check out of CheckNotFoundStatus * Move error check out of CheckBadRequestStatus * Move error check out of CheckNotImplementedStatus and CheckRequestEntityTooLargeStatus * Move error check out of CheckInternalErrorStatus * Move error check out of CheckServiceUnavailableStatus * Remove error check from checkHTTPStatus * Remove remaining references to Response.Error * Check previously unchecked errors * Manually fix compile and linter errors * Return error in CreateWebSocket methods * Return error instead of *AppError in DoApi methods * Manually fix bad replacments * Conistently return Response and error * Use err instead of seperate bool return value to indicate success * Reduce ussage of model.AppError in web/oauth_test.go * Remove client4.Must * Check error in buf.ReadFrom * Fix failing tests
Этот коммит содержится в:
Ben Schumacher
коммит произвёл
GitHub
GitHub
родитель
96593580ae
Коммит
a8ca5c423f
@@ -8,6 +8,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v6/model"
|
||||
)
|
||||
@@ -15,39 +16,39 @@ import (
|
||||
func TestGetUserStatus(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
Client := th.Client
|
||||
client := th.Client
|
||||
|
||||
t.Run("offline status", func(t *testing.T) {
|
||||
userStatus, resp := Client.GetUserStatus(th.BasicUser.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err := client.GetUserStatus(th.BasicUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "offline", userStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("online status", func(t *testing.T) {
|
||||
th.App.SetStatusOnline(th.BasicUser.Id, true)
|
||||
userStatus, resp := Client.GetUserStatus(th.BasicUser.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err := client.GetUserStatus(th.BasicUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "online", userStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("away status", func(t *testing.T) {
|
||||
th.App.SetStatusAwayIfNeeded(th.BasicUser.Id, true)
|
||||
userStatus, resp := Client.GetUserStatus(th.BasicUser.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err := client.GetUserStatus(th.BasicUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "away", userStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("dnd status", func(t *testing.T) {
|
||||
th.App.SetStatusDoNotDisturb(th.BasicUser.Id)
|
||||
userStatus, resp := Client.GetUserStatus(th.BasicUser.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err := client.GetUserStatus(th.BasicUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "dnd", userStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("dnd status timed", func(t *testing.T) {
|
||||
th.App.SetStatusDoNotDisturbTimed(th.BasicUser.Id, time.Now().Add(10*time.Minute).Unix())
|
||||
userStatus, resp := Client.GetUserStatus(th.BasicUser.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err := client.GetUserStatus(th.BasicUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "dnd", userStatus.Status)
|
||||
})
|
||||
|
||||
@@ -55,43 +56,44 @@ func TestGetUserStatus(t *testing.T) {
|
||||
task := model.CreateRecurringTaskFromNextIntervalTime("Unset DND Statuses From Test", th.App.UpdateDNDStatusOfUsers, 1*time.Second)
|
||||
defer task.Cancel()
|
||||
th.App.SetStatusOnline(th.BasicUser.Id, true)
|
||||
userStatus, resp := Client.GetUserStatus(th.BasicUser.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err := client.GetUserStatus(th.BasicUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "online", userStatus.Status)
|
||||
th.App.SetStatusDoNotDisturbTimed(th.BasicUser.Id, time.Now().Add(2*time.Second).Unix())
|
||||
userStatus, resp = Client.GetUserStatus(th.BasicUser.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err = client.GetUserStatus(th.BasicUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "dnd", userStatus.Status)
|
||||
time.Sleep(3 * time.Second)
|
||||
userStatus, resp = Client.GetUserStatus(th.BasicUser.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err = client.GetUserStatus(th.BasicUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "online", userStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("back to offline status", func(t *testing.T) {
|
||||
th.App.SetStatusOffline(th.BasicUser.Id, true)
|
||||
userStatus, resp := Client.GetUserStatus(th.BasicUser.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err := client.GetUserStatus(th.BasicUser.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "offline", userStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("get other user status", func(t *testing.T) {
|
||||
//Get user2 status logged as user1
|
||||
userStatus, resp := Client.GetUserStatus(th.BasicUser2.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err := client.GetUserStatus(th.BasicUser2.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "offline", userStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("get status from logged out user", func(t *testing.T) {
|
||||
Client.Logout()
|
||||
_, resp := Client.GetUserStatus(th.BasicUser2.Id, "")
|
||||
client.Logout()
|
||||
_, resp, err := client.GetUserStatus(th.BasicUser2.Id, "")
|
||||
require.Error(t, err)
|
||||
CheckUnauthorizedStatus(t, resp)
|
||||
})
|
||||
|
||||
t.Run("get status from other user", func(t *testing.T) {
|
||||
th.LoginBasic2()
|
||||
userStatus, resp := Client.GetUserStatus(th.BasicUser2.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
userStatus, _, err := client.GetUserStatus(th.BasicUser2.Id, "")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "offline", userStatus.Status)
|
||||
})
|
||||
}
|
||||
@@ -99,28 +101,31 @@ func TestGetUserStatus(t *testing.T) {
|
||||
func TestGetUsersStatusesByIds(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
Client := th.Client
|
||||
client := th.Client
|
||||
|
||||
usersIds := []string{th.BasicUser.Id, th.BasicUser2.Id}
|
||||
|
||||
t.Run("empty userIds list", func(t *testing.T) {
|
||||
_, resp := Client.GetUsersStatusesByIds([]string{})
|
||||
_, resp, err := client.GetUsersStatusesByIds([]string{})
|
||||
require.Error(t, err)
|
||||
CheckBadRequestStatus(t, resp)
|
||||
})
|
||||
|
||||
t.Run("completely invalid userIds list", func(t *testing.T) {
|
||||
_, resp := Client.GetUsersStatusesByIds([]string{"invalid_user_id", "invalid_user_id"})
|
||||
_, resp, err := client.GetUsersStatusesByIds([]string{"invalid_user_id", "invalid_user_id"})
|
||||
require.Error(t, err)
|
||||
CheckBadRequestStatus(t, resp)
|
||||
})
|
||||
|
||||
t.Run("partly invalid userIds list", func(t *testing.T) {
|
||||
_, resp := Client.GetUsersStatusesByIds([]string{th.BasicUser.Id, "invalid_user_id"})
|
||||
_, resp, err := client.GetUsersStatusesByIds([]string{th.BasicUser.Id, "invalid_user_id"})
|
||||
require.Error(t, err)
|
||||
CheckBadRequestStatus(t, resp)
|
||||
})
|
||||
|
||||
t.Run("offline status", func(t *testing.T) {
|
||||
usersStatuses, resp := Client.GetUsersStatusesByIds(usersIds)
|
||||
CheckNoError(t, resp)
|
||||
usersStatuses, _, err := client.GetUsersStatusesByIds(usersIds)
|
||||
require.NoError(t, err)
|
||||
for _, userStatus := range usersStatuses {
|
||||
assert.Equal(t, "offline", userStatus.Status)
|
||||
}
|
||||
@@ -129,8 +134,8 @@ func TestGetUsersStatusesByIds(t *testing.T) {
|
||||
t.Run("online status", func(t *testing.T) {
|
||||
th.App.SetStatusOnline(th.BasicUser.Id, true)
|
||||
th.App.SetStatusOnline(th.BasicUser2.Id, true)
|
||||
usersStatuses, resp := Client.GetUsersStatusesByIds(usersIds)
|
||||
CheckNoError(t, resp)
|
||||
usersStatuses, _, err := client.GetUsersStatusesByIds(usersIds)
|
||||
require.NoError(t, err)
|
||||
for _, userStatus := range usersStatuses {
|
||||
assert.Equal(t, "online", userStatus.Status)
|
||||
}
|
||||
@@ -139,8 +144,8 @@ func TestGetUsersStatusesByIds(t *testing.T) {
|
||||
t.Run("away status", func(t *testing.T) {
|
||||
th.App.SetStatusAwayIfNeeded(th.BasicUser.Id, true)
|
||||
th.App.SetStatusAwayIfNeeded(th.BasicUser2.Id, true)
|
||||
usersStatuses, resp := Client.GetUsersStatusesByIds(usersIds)
|
||||
CheckNoError(t, resp)
|
||||
usersStatuses, _, err := client.GetUsersStatusesByIds(usersIds)
|
||||
require.NoError(t, err)
|
||||
for _, userStatus := range usersStatuses {
|
||||
assert.Equal(t, "away", userStatus.Status)
|
||||
}
|
||||
@@ -149,8 +154,8 @@ func TestGetUsersStatusesByIds(t *testing.T) {
|
||||
t.Run("dnd status", func(t *testing.T) {
|
||||
th.App.SetStatusDoNotDisturb(th.BasicUser.Id)
|
||||
th.App.SetStatusDoNotDisturb(th.BasicUser2.Id)
|
||||
usersStatuses, resp := Client.GetUsersStatusesByIds(usersIds)
|
||||
CheckNoError(t, resp)
|
||||
usersStatuses, _, err := client.GetUsersStatusesByIds(usersIds)
|
||||
require.NoError(t, err)
|
||||
for _, userStatus := range usersStatuses {
|
||||
assert.Equal(t, "dnd", userStatus.Status)
|
||||
}
|
||||
@@ -159,17 +164,18 @@ func TestGetUsersStatusesByIds(t *testing.T) {
|
||||
t.Run("dnd status", func(t *testing.T) {
|
||||
th.App.SetStatusDoNotDisturbTimed(th.BasicUser.Id, time.Now().Add(10*time.Minute).Unix())
|
||||
th.App.SetStatusDoNotDisturbTimed(th.BasicUser2.Id, time.Now().Add(15*time.Minute).Unix())
|
||||
usersStatuses, resp := Client.GetUsersStatusesByIds(usersIds)
|
||||
CheckNoError(t, resp)
|
||||
usersStatuses, _, err := client.GetUsersStatusesByIds(usersIds)
|
||||
require.NoError(t, err)
|
||||
for _, userStatus := range usersStatuses {
|
||||
assert.Equal(t, "dnd", userStatus.Status)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("get statuses from logged out user", func(t *testing.T) {
|
||||
Client.Logout()
|
||||
client.Logout()
|
||||
|
||||
_, resp := Client.GetUsersStatusesByIds(usersIds)
|
||||
_, resp, err := client.GetUsersStatusesByIds(usersIds)
|
||||
require.Error(t, err)
|
||||
CheckUnauthorizedStatus(t, resp)
|
||||
})
|
||||
}
|
||||
@@ -177,59 +183,62 @@ func TestGetUsersStatusesByIds(t *testing.T) {
|
||||
func TestUpdateUserStatus(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
Client := th.Client
|
||||
client := th.Client
|
||||
|
||||
t.Run("set online status", func(t *testing.T) {
|
||||
toUpdateUserStatus := &model.Status{Status: "online", UserId: th.BasicUser.Id}
|
||||
updateUserStatus, resp := Client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
CheckNoError(t, resp)
|
||||
updateUserStatus, _, err := client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "online", updateUserStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("set away status", func(t *testing.T) {
|
||||
toUpdateUserStatus := &model.Status{Status: "away", UserId: th.BasicUser.Id}
|
||||
updateUserStatus, resp := Client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
CheckNoError(t, resp)
|
||||
updateUserStatus, _, err := client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "away", updateUserStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("set dnd status timed", func(t *testing.T) {
|
||||
toUpdateUserStatus := &model.Status{Status: "dnd", UserId: th.BasicUser.Id, DNDEndTime: time.Now().Add(10 * time.Minute).Unix()}
|
||||
updateUserStatus, resp := Client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
CheckNoError(t, resp)
|
||||
updateUserStatus, _, err := client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "dnd", updateUserStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("set offline status", func(t *testing.T) {
|
||||
toUpdateUserStatus := &model.Status{Status: "offline", UserId: th.BasicUser.Id}
|
||||
updateUserStatus, resp := Client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
CheckNoError(t, resp)
|
||||
updateUserStatus, _, err := client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "offline", updateUserStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("set status for other user as regular user", func(t *testing.T) {
|
||||
toUpdateUserStatus := &model.Status{Status: "online", UserId: th.BasicUser2.Id}
|
||||
_, resp := Client.UpdateUserStatus(th.BasicUser2.Id, toUpdateUserStatus)
|
||||
_, resp, err := client.UpdateUserStatus(th.BasicUser2.Id, toUpdateUserStatus)
|
||||
require.Error(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
})
|
||||
|
||||
t.Run("set status for other user as admin user", func(t *testing.T) {
|
||||
toUpdateUserStatus := &model.Status{Status: "online", UserId: th.BasicUser2.Id}
|
||||
updateUserStatus, _ := th.SystemAdminClient.UpdateUserStatus(th.BasicUser2.Id, toUpdateUserStatus)
|
||||
updateUserStatus, _, _ := th.SystemAdminClient.UpdateUserStatus(th.BasicUser2.Id, toUpdateUserStatus)
|
||||
assert.Equal(t, "online", updateUserStatus.Status)
|
||||
})
|
||||
|
||||
t.Run("not matching status user id and the user id passed in the function", func(t *testing.T) {
|
||||
toUpdateUserStatus := &model.Status{Status: "online", UserId: th.BasicUser2.Id}
|
||||
_, resp := Client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
_, resp, err := client.UpdateUserStatus(th.BasicUser.Id, toUpdateUserStatus)
|
||||
require.Error(t, err)
|
||||
CheckBadRequestStatus(t, resp)
|
||||
})
|
||||
|
||||
t.Run("get statuses from logged out user", func(t *testing.T) {
|
||||
toUpdateUserStatus := &model.Status{Status: "online", UserId: th.BasicUser2.Id}
|
||||
Client.Logout()
|
||||
client.Logout()
|
||||
|
||||
_, resp := Client.UpdateUserStatus(th.BasicUser2.Id, toUpdateUserStatus)
|
||||
_, resp, err := client.UpdateUserStatus(th.BasicUser2.Id, toUpdateUserStatus)
|
||||
require.Error(t, err)
|
||||
CheckUnauthorizedStatus(t, resp)
|
||||
})
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user