Replacing require.nil in api layer (#16906)
* Replacing require.nil in api layer * Fixing some tests * Fixing tests * Addressing PR review comments Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Jesús Espino
коммит произвёл
GitHub
GitHub
родитель
9992a27a90
Коммит
31a80a5351
@@ -32,7 +32,7 @@ func TestCreateUpload(t *testing.T) {
|
||||
defer th.App.UpdateConfig(func(cfg *model.Config) { *cfg.FileSettings.EnableFileAttachments = true })
|
||||
u, resp := th.Client.CreateUpload(us)
|
||||
require.Nil(t, u)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "api.file.attachments.disabled.app_error", resp.Error.Id)
|
||||
require.Equal(t, http.StatusNotImplemented, resp.StatusCode)
|
||||
})
|
||||
@@ -41,7 +41,7 @@ func TestCreateUpload(t *testing.T) {
|
||||
us.ChannelId = th.BasicPrivateChannel2.Id
|
||||
u, resp := th.Client.CreateUpload(us)
|
||||
require.Nil(t, u)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "api.context.permissions.app_error", resp.Error.Id)
|
||||
require.Equal(t, http.StatusForbidden, resp.StatusCode)
|
||||
})
|
||||
@@ -58,11 +58,11 @@ func TestCreateUpload(t *testing.T) {
|
||||
testsDir, _ := fileutils.FindDir("tests")
|
||||
|
||||
importFile, err := os.Open(testsDir + "/import_test.zip")
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
defer importFile.Close()
|
||||
|
||||
info, err := importFile.Stat()
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
|
||||
t.Run("permissions error", func(t *testing.T) {
|
||||
us := &model.UploadSession{
|
||||
@@ -72,7 +72,7 @@ func TestCreateUpload(t *testing.T) {
|
||||
}
|
||||
u, resp := th.Client.CreateUpload(us)
|
||||
require.Nil(t, u)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "api.context.permissions.app_error", resp.Error.Id)
|
||||
require.Equal(t, http.StatusForbidden, resp.StatusCode)
|
||||
})
|
||||
@@ -111,7 +111,7 @@ func TestGetUpload(t *testing.T) {
|
||||
t.Run("upload not found", func(t *testing.T) {
|
||||
u, resp := th.Client.GetUpload(model.NewId())
|
||||
require.Nil(t, u)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "app.upload.get.app_error", resp.Error.Id)
|
||||
require.Equal(t, http.StatusNotFound, resp.StatusCode)
|
||||
})
|
||||
@@ -119,7 +119,7 @@ func TestGetUpload(t *testing.T) {
|
||||
t.Run("no permissions", func(t *testing.T) {
|
||||
u, resp := th.Client.GetUpload(us.Id)
|
||||
require.Nil(t, u)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "api.upload.get_upload.forbidden.app_error", resp.Error.Id)
|
||||
})
|
||||
|
||||
@@ -142,7 +142,7 @@ func TestGetUploadsForUser(t *testing.T) {
|
||||
|
||||
t.Run("no permissions", func(t *testing.T) {
|
||||
uss, resp := th.Client.GetUploadsForUser(th.BasicUser2.Id)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "api.user.get_uploads_for_user.forbidden.app_error", resp.Error.Id)
|
||||
require.Nil(t, uss)
|
||||
})
|
||||
@@ -211,14 +211,14 @@ func TestUploadData(t *testing.T) {
|
||||
defer th.App.UpdateConfig(func(cfg *model.Config) { *cfg.FileSettings.EnableFileAttachments = true })
|
||||
info, resp := th.Client.UploadData(model.NewId(), bytes.NewReader(data))
|
||||
require.Nil(t, info)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "api.file.attachments.disabled.app_error", resp.Error.Id)
|
||||
})
|
||||
|
||||
t.Run("upload not found", func(t *testing.T) {
|
||||
info, resp := th.Client.UploadData(model.NewId(), bytes.NewReader(data))
|
||||
require.Nil(t, info)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "app.upload.get.app_error", resp.Error.Id)
|
||||
require.Equal(t, http.StatusNotFound, resp.StatusCode)
|
||||
})
|
||||
@@ -226,7 +226,7 @@ func TestUploadData(t *testing.T) {
|
||||
t.Run("no permissions", func(t *testing.T) {
|
||||
info, resp := th.Client.UploadData(us.Id, bytes.NewReader(data))
|
||||
require.Nil(t, info)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "api.context.permissions.app_error", resp.Error.Id)
|
||||
})
|
||||
|
||||
@@ -238,7 +238,7 @@ func TestUploadData(t *testing.T) {
|
||||
|
||||
info, resp := th.Client.UploadData(u.Id, bytes.NewReader(append(data, 0x00)))
|
||||
require.Nil(t, info)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "api.upload.upload_data.invalid_content_length", resp.Error.Id)
|
||||
})
|
||||
|
||||
@@ -311,19 +311,19 @@ func TestUploadDataMultipart(t *testing.T) {
|
||||
mpData := &bytes.Buffer{}
|
||||
mpWriter := multipart.NewWriter(mpData)
|
||||
part, err := mpWriter.CreateFormFile("data", us.Filename)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
n, err := part.Write(data)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, len(data), n)
|
||||
err = mpWriter.Close()
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
return mpData, mpWriter.FormDataContentType()
|
||||
}
|
||||
|
||||
t.Run("bad content-type", func(t *testing.T) {
|
||||
info, resp := th.Client.DoUploadFile("/uploads/"+us.Id, data, "multipart/form-data;")
|
||||
require.Nil(t, info)
|
||||
require.Error(t, resp.Error)
|
||||
require.NotNil(t, resp.Error)
|
||||
require.Equal(t, "api.upload.upload_data.invalid_content_type", resp.Error.Id)
|
||||
})
|
||||
|
||||
@@ -331,11 +331,11 @@ func TestUploadDataMultipart(t *testing.T) {
|
||||
mpData, contentType := genMultipartData(t, data)
|
||||
|
||||
req, err := http.NewRequest("POST", th.Client.ApiUrl+"/uploads/"+us.Id, mpData)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
req.Header.Set("Content-Type", contentType)
|
||||
req.Header.Set(model.HEADER_AUTH, th.Client.AuthType+" "+th.Client.AuthToken)
|
||||
res, err := th.Client.HttpClient.Do(req)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
info := model.FileInfoFromJson(res.Body)
|
||||
res.Body.Close()
|
||||
require.NotEmpty(t, info)
|
||||
@@ -355,22 +355,22 @@ func TestUploadDataMultipart(t *testing.T) {
|
||||
require.NotEmpty(t, u)
|
||||
|
||||
req, err := http.NewRequest("POST", th.Client.ApiUrl+"/uploads/"+u.Id, mpData)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
req.Header.Set("Content-Type", contentType)
|
||||
req.Header.Set(model.HEADER_AUTH, th.Client.AuthType+" "+th.Client.AuthToken)
|
||||
res, err := th.Client.HttpClient.Do(req)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, http.StatusNoContent, res.StatusCode)
|
||||
require.Equal(t, int64(0), res.ContentLength)
|
||||
|
||||
mpData, contentType = genMultipartData(t, data[5*1024*1024:])
|
||||
|
||||
req, err = http.NewRequest("POST", th.Client.ApiUrl+"/uploads/"+u.Id, mpData)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
req.Header.Set("Content-Type", contentType)
|
||||
req.Header.Set(model.HEADER_AUTH, th.Client.AuthType+" "+th.Client.AuthToken)
|
||||
res, err = th.Client.HttpClient.Do(req)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
info := model.FileInfoFromJson(res.Body)
|
||||
res.Body.Close()
|
||||
require.NotEmpty(t, info)
|
||||
|
||||
Ссылка в новой задаче
Block a user