Replacing require.nil in app layer (#16905)
* Replacing require.nil in app layer * Fixing some tests * Fixing tests * Reverting the error correction, defering it for another PR * Fixing golangci-lint errors Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Jesús Espino
коммит произвёл
GitHub
GitHub
родитель
fd2e75bc5b
Коммит
69ff686667
@@ -94,11 +94,11 @@ func TestExportUserChannels(t *testing.T) {
|
||||
var preferences model.Preferences
|
||||
preferences = append(preferences, preference)
|
||||
err := th.App.Srv().Store.Preference().Save(&preferences)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
|
||||
th.App.UpdateChannelMemberNotifyProps(notifyProps, channel.Id, user.Id)
|
||||
exportData, err := th.App.buildUserChannelMemberships(user.Id, team.Id)
|
||||
require.Nil(t, err)
|
||||
exportData, appErr := th.App.buildUserChannelMemberships(user.Id, team.Id)
|
||||
require.Nil(t, appErr)
|
||||
assert.Equal(t, len(*exportData), 3)
|
||||
for _, data := range *exportData {
|
||||
if *data.Name == channelName {
|
||||
@@ -142,7 +142,7 @@ func TestCopyEmojiImages(t *testing.T) {
|
||||
defer os.RemoveAll(filePath)
|
||||
|
||||
copyError := th.App.copyEmojiImages(emoji.Id, emojiImagePath, pathToDir)
|
||||
require.Nil(t, copyError)
|
||||
require.NoError(t, copyError)
|
||||
|
||||
_, err = os.Stat(pathToDir + "/" + emoji.Id + "/image")
|
||||
require.False(t, os.IsNotExist(err), "File should exist ")
|
||||
@@ -155,17 +155,17 @@ func TestExportCustomEmoji(t *testing.T) {
|
||||
filePath := "../demo.json"
|
||||
|
||||
fileWriter, err := os.Create(filePath)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
defer os.Remove(filePath)
|
||||
|
||||
dirNameToExportEmoji := "exported_emoji_test"
|
||||
defer os.RemoveAll("../" + dirNameToExportEmoji)
|
||||
|
||||
outPath, err := filepath.Abs(filePath)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = th.App.exportCustomEmoji(fileWriter, outPath, dirNameToExportEmoji, false)
|
||||
require.Nil(t, err, "should not have failed")
|
||||
_, appErr := th.App.exportCustomEmoji(fileWriter, outPath, dirNameToExportEmoji, false)
|
||||
require.Nil(t, appErr, "should not have failed")
|
||||
}
|
||||
|
||||
func TestExportAllUsers(t *testing.T) {
|
||||
@@ -228,7 +228,7 @@ func TestExportDMChannel(t *testing.T) {
|
||||
require.Nil(t, err)
|
||||
|
||||
channels, nErr := th1.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 1, len(channels))
|
||||
|
||||
th1.TearDown()
|
||||
@@ -237,7 +237,7 @@ func TestExportDMChannel(t *testing.T) {
|
||||
defer th2.TearDown()
|
||||
|
||||
channels, nErr = th2.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 0, len(channels))
|
||||
|
||||
// import the exported channel
|
||||
@@ -247,7 +247,7 @@ func TestExportDMChannel(t *testing.T) {
|
||||
|
||||
// Ensure the Members of the imported DM channel is the same was from the exported
|
||||
channels, nErr = th2.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 1, len(channels))
|
||||
assert.ElementsMatch(t, []string{th1.BasicUser.Username, th1.BasicUser2.Username}, *channels[0].Members)
|
||||
}
|
||||
@@ -264,14 +264,14 @@ func TestExportDMChannelToSelf(t *testing.T) {
|
||||
require.Nil(t, err)
|
||||
|
||||
channels, nErr := th1.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 1, len(channels))
|
||||
|
||||
th2 := Setup(t)
|
||||
defer th2.TearDown()
|
||||
|
||||
channels, nErr = th2.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 0, len(channels))
|
||||
|
||||
// import the exported channel
|
||||
@@ -280,7 +280,7 @@ func TestExportDMChannelToSelf(t *testing.T) {
|
||||
assert.Equal(t, 0, i)
|
||||
|
||||
channels, nErr = th2.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 1, len(channels))
|
||||
assert.Equal(t, 1, len((*channels[0].Members)))
|
||||
assert.Equal(t, th1.BasicUser.Username, (*channels[0].Members)[0])
|
||||
@@ -302,7 +302,7 @@ func TestExportGMChannel(t *testing.T) {
|
||||
require.Nil(t, err)
|
||||
|
||||
channels, nErr := th1.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 1, len(channels))
|
||||
|
||||
th1.TearDown()
|
||||
@@ -311,7 +311,7 @@ func TestExportGMChannel(t *testing.T) {
|
||||
defer th2.TearDown()
|
||||
|
||||
channels, nErr = th2.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 0, len(channels))
|
||||
}
|
||||
|
||||
@@ -334,7 +334,7 @@ func TestExportGMandDMChannels(t *testing.T) {
|
||||
require.Nil(t, err)
|
||||
|
||||
channels, nErr := th1.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 2, len(channels))
|
||||
|
||||
th1.TearDown()
|
||||
@@ -343,7 +343,7 @@ func TestExportGMandDMChannels(t *testing.T) {
|
||||
defer th2.TearDown()
|
||||
|
||||
channels, nErr = th2.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 0, len(channels))
|
||||
|
||||
// import the exported channel
|
||||
@@ -353,7 +353,7 @@ func TestExportGMandDMChannels(t *testing.T) {
|
||||
|
||||
// Ensure the Members of the imported GM channel is the same was from the exported
|
||||
channels, nErr = th2.App.Srv().Store.Channel().GetAllDirectChannelsForExportAfter(1000, "00000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
|
||||
// Adding some deteminism so its possible to assert on slice index
|
||||
sort.Slice(channels, func(i, j int) bool { return channels[i].Type > channels[j].Type })
|
||||
@@ -409,12 +409,12 @@ func TestExportDMandGMPost(t *testing.T) {
|
||||
th1.App.CreatePost(p4, gmChannel, false, true)
|
||||
|
||||
posts, err := th1.App.Srv().Store.Post().GetDirectPostParentsForExportAfter(1000, "0000000")
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, 4, len(posts))
|
||||
|
||||
var b bytes.Buffer
|
||||
err = th1.App.BulkExport(&b, "somePath", BulkExportOpts{})
|
||||
require.Nil(t, err)
|
||||
appErr := th1.App.BulkExport(&b, "somePath", BulkExportOpts{})
|
||||
require.Nil(t, appErr)
|
||||
|
||||
th1.TearDown()
|
||||
|
||||
@@ -422,16 +422,16 @@ func TestExportDMandGMPost(t *testing.T) {
|
||||
defer th2.TearDown()
|
||||
|
||||
posts, err = th2.App.Srv().Store.Post().GetDirectPostParentsForExportAfter(1000, "0000000")
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, 0, len(posts))
|
||||
|
||||
// import the exported posts
|
||||
err, i := th2.App.BulkImport(&b, false, 5)
|
||||
assert.Nil(t, err)
|
||||
appErr, i := th2.App.BulkImport(&b, false, 5)
|
||||
assert.Nil(t, appErr)
|
||||
assert.Equal(t, 0, i)
|
||||
|
||||
posts, err = th2.App.Srv().Store.Post().GetDirectPostParentsForExportAfter(1000, "0000000")
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Adding some deteminism so its possible to assert on slice index
|
||||
sort.Slice(posts, func(i, j int) bool { return posts[i].Message > posts[j].Message })
|
||||
@@ -482,14 +482,14 @@ func TestExportPostWithProps(t *testing.T) {
|
||||
th1.App.CreatePost(p2, gmChannel, false, true)
|
||||
|
||||
posts, err := th1.App.Srv().Store.Post().GetDirectPostParentsForExportAfter(1000, "0000000")
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, posts, 2)
|
||||
require.NotEmpty(t, posts[0].Props)
|
||||
require.NotEmpty(t, posts[1].Props)
|
||||
|
||||
var b bytes.Buffer
|
||||
err = th1.App.BulkExport(&b, "somePath", BulkExportOpts{})
|
||||
require.Nil(t, err)
|
||||
appErr := th1.App.BulkExport(&b, "somePath", BulkExportOpts{})
|
||||
require.Nil(t, appErr)
|
||||
|
||||
th1.TearDown()
|
||||
|
||||
@@ -497,16 +497,16 @@ func TestExportPostWithProps(t *testing.T) {
|
||||
defer th2.TearDown()
|
||||
|
||||
posts, err = th2.App.Srv().Store.Post().GetDirectPostParentsForExportAfter(1000, "0000000")
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, posts, 0)
|
||||
|
||||
// import the exported posts
|
||||
err, i := th2.App.BulkImport(&b, false, 5)
|
||||
assert.Nil(t, err)
|
||||
appErr, i := th2.App.BulkImport(&b, false, 5)
|
||||
assert.Nil(t, appErr)
|
||||
assert.Equal(t, 0, i)
|
||||
|
||||
posts, err = th2.App.Srv().Store.Post().GetDirectPostParentsForExportAfter(1000, "0000000")
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Adding some determinism so its possible to assert on slice index
|
||||
sort.Slice(posts, func(i, j int) bool { return posts[i].Message > posts[j].Message })
|
||||
@@ -530,7 +530,7 @@ func TestExportDMPostWithSelf(t *testing.T) {
|
||||
require.Nil(t, err)
|
||||
|
||||
posts, nErr := th1.App.Srv().Store.Post().GetDirectPostParentsForExportAfter(1000, "0000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 1, len(posts))
|
||||
|
||||
th1.TearDown()
|
||||
@@ -539,7 +539,7 @@ func TestExportDMPostWithSelf(t *testing.T) {
|
||||
defer th2.TearDown()
|
||||
|
||||
posts, nErr = th2.App.Srv().Store.Post().GetDirectPostParentsForExportAfter(1000, "0000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 0, len(posts))
|
||||
|
||||
// import the exported posts
|
||||
@@ -548,7 +548,7 @@ func TestExportDMPostWithSelf(t *testing.T) {
|
||||
assert.Equal(t, 0, i)
|
||||
|
||||
posts, nErr = th2.App.Srv().Store.Post().GetDirectPostParentsForExportAfter(1000, "0000000")
|
||||
require.Nil(t, nErr)
|
||||
require.NoError(t, nErr)
|
||||
assert.Equal(t, 1, len(posts))
|
||||
assert.Equal(t, 1, len((*posts[0].ChannelMembers)))
|
||||
assert.Equal(t, th1.BasicUser.Username, (*posts[0].ChannelMembers)[0])
|
||||
@@ -559,23 +559,23 @@ func TestBulkExport(t *testing.T) {
|
||||
testsDir, _ := fileutils.FindDir("tests")
|
||||
|
||||
dir, err := ioutil.TempDir("", "import_test")
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
defer os.RemoveAll(dir)
|
||||
|
||||
extractImportFile := func(filePath string) *os.File {
|
||||
importFile, err2 := os.Open(filePath)
|
||||
require.Nil(t, err2)
|
||||
require.NoError(t, err2)
|
||||
defer importFile.Close()
|
||||
|
||||
info, err2 := importFile.Stat()
|
||||
require.Nil(t, err2)
|
||||
require.NoError(t, err2)
|
||||
|
||||
paths, err2 := utils.UnzipToPath(importFile, info.Size(), dir)
|
||||
require.Nil(t, err2)
|
||||
require.NoError(t, err2)
|
||||
require.NotEmpty(t, paths)
|
||||
|
||||
jsonFile, err2 := os.Open(filepath.Join(dir, "import.jsonl"))
|
||||
require.Nil(t, err2)
|
||||
require.NoError(t, err2)
|
||||
|
||||
return jsonFile
|
||||
}
|
||||
@@ -583,19 +583,19 @@ func TestBulkExport(t *testing.T) {
|
||||
jsonFile := extractImportFile(filepath.Join(testsDir, "import_test.zip"))
|
||||
defer jsonFile.Close()
|
||||
|
||||
err, _ = th.App.BulkImportWithPath(jsonFile, false, 1, dir)
|
||||
require.Nil(t, err)
|
||||
appErr, _ := th.App.BulkImportWithPath(jsonFile, false, 1, dir)
|
||||
require.Nil(t, appErr)
|
||||
|
||||
exportFile, err := os.Create(filepath.Join(dir, "export.zip"))
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
defer exportFile.Close()
|
||||
|
||||
opts := BulkExportOpts{
|
||||
IncludeAttachments: true,
|
||||
CreateArchive: true,
|
||||
}
|
||||
err = th.App.BulkExport(exportFile, dir, opts)
|
||||
require.Nil(t, err)
|
||||
appErr = th.App.BulkExport(exportFile, dir, opts)
|
||||
require.Nil(t, appErr)
|
||||
|
||||
th.TearDown()
|
||||
th = Setup(t)
|
||||
@@ -604,6 +604,6 @@ func TestBulkExport(t *testing.T) {
|
||||
jsonFile = extractImportFile(filepath.Join(dir, "export.zip"))
|
||||
defer jsonFile.Close()
|
||||
|
||||
err, _ = th.App.BulkImportWithPath(jsonFile, false, 1, filepath.Join(dir, "data"))
|
||||
require.Nil(t, err)
|
||||
appErr, _ = th.App.BulkImportWithPath(jsonFile, false, 1, filepath.Join(dir, "data"))
|
||||
require.Nil(t, appErr)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user