mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-08-06 02:15:20 +02:00
Add testifylint to lint checks (#4535)
go-require lint is ignored for now Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4535 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: TheFox0x7 <thefox0x7@gmail.com> Co-committed-by: TheFox0x7 <thefox0x7@gmail.com>
This commit is contained in:
parent
94933470cd
commit
4de909747b
504 changed files with 5028 additions and 4680 deletions
|
@ -26,6 +26,7 @@ import (
|
|||
"code.gitea.io/gitea/modules/test"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
const subjectTpl = `
|
||||
|
@ -51,12 +52,12 @@ const bodyTpl = `
|
|||
`
|
||||
|
||||
func prepareMailerTest(t *testing.T) (doer *user_model.User, repo *repo_model.Repository, issue *issues_model.Issue, comment *issues_model.Comment) {
|
||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
doer = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
repo = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1, Owner: doer})
|
||||
issue = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1, Repo: repo, Poster: doer})
|
||||
assert.NoError(t, issue.LoadRepo(db.DefaultContext))
|
||||
require.NoError(t, issue.LoadRepo(db.DefaultContext))
|
||||
comment = unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2, Issue: issue})
|
||||
return doer, repo, issue, comment
|
||||
}
|
||||
|
@ -83,7 +84,7 @@ func TestComposeIssueCommentMessage(t *testing.T) {
|
|||
Content: fmt.Sprintf("test @%s %s#%d body", doer.Name, issue.Repo.FullName(), issue.Index),
|
||||
Comment: comment,
|
||||
}, "en-US", recipients, false, "issue comment")
|
||||
assert.NoError(t, err)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, msgs, 2)
|
||||
gomailMsg := msgs[0].ToMessage()
|
||||
replyTo := gomailMsg.GetHeader("Reply-To")[0]
|
||||
|
@ -105,7 +106,7 @@ func TestComposeIssueCommentMessage(t *testing.T) {
|
|||
gomailMsg.WriteTo(&buf)
|
||||
|
||||
b, err := io.ReadAll(quotedprintable.NewReader(&buf))
|
||||
assert.NoError(t, err)
|
||||
require.NoError(t, err)
|
||||
|
||||
// text/plain
|
||||
assert.Contains(t, string(b), fmt.Sprintf(`( %s )`, doer.HTMLURL()))
|
||||
|
@ -126,7 +127,7 @@ func TestComposeIssueMessage(t *testing.T) {
|
|||
Issue: issue, Doer: doer, ActionType: activities_model.ActionCreateIssue,
|
||||
Content: "test body",
|
||||
}, "en-US", recipients, false, "issue create")
|
||||
assert.NoError(t, err)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, msgs, 2)
|
||||
|
||||
gomailMsg := msgs[0].ToMessage()
|
||||
|
@ -147,7 +148,7 @@ func TestComposeIssueMessage(t *testing.T) {
|
|||
|
||||
func TestMailerIssueTemplate(t *testing.T) {
|
||||
defer MockMailSettings(nil)()
|
||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
|
||||
|
@ -170,13 +171,13 @@ func TestMailerIssueTemplate(t *testing.T) {
|
|||
ctx.Context = context.Background()
|
||||
fromMention := false
|
||||
msgs, err := composeIssueCommentMessages(ctx, "en-US", recipients, fromMention, "TestMailerIssueTemplate")
|
||||
assert.NoError(t, err)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, msgs, 1)
|
||||
return msgs[0]
|
||||
}
|
||||
|
||||
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
|
||||
assert.NoError(t, issue.LoadRepo(db.DefaultContext))
|
||||
require.NoError(t, issue.LoadRepo(db.DefaultContext))
|
||||
|
||||
msg := testCompose(t, &mailCommentContext{
|
||||
Issue: issue, Doer: doer, ActionType: activities_model.ActionCreateIssue,
|
||||
|
@ -205,7 +206,7 @@ func TestMailerIssueTemplate(t *testing.T) {
|
|||
expect(t, msg, issue, comment.Content)
|
||||
|
||||
pull := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
|
||||
assert.NoError(t, pull.LoadAttributes(db.DefaultContext))
|
||||
require.NoError(t, pull.LoadAttributes(db.DefaultContext))
|
||||
pullComment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 4, Issue: pull})
|
||||
|
||||
msg = testCompose(t, &mailCommentContext{
|
||||
|
@ -221,7 +222,7 @@ func TestMailerIssueTemplate(t *testing.T) {
|
|||
expect(t, msg, pull, pullComment.Content, pull.PullRequest.BaseBranch)
|
||||
|
||||
reviewComment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 9})
|
||||
assert.NoError(t, reviewComment.LoadReview(db.DefaultContext))
|
||||
require.NoError(t, reviewComment.LoadReview(db.DefaultContext))
|
||||
|
||||
approveComment := reviewComment
|
||||
approveComment.Review.Type = issues_model.ReviewTypeApprove
|
||||
|
@ -298,7 +299,7 @@ func TestTemplateSelection(t *testing.T) {
|
|||
func TestTemplateServices(t *testing.T) {
|
||||
defer MockMailSettings(nil)()
|
||||
doer, _, issue, comment := prepareMailerTest(t)
|
||||
assert.NoError(t, issue.LoadRepo(db.DefaultContext))
|
||||
require.NoError(t, issue.LoadRepo(db.DefaultContext))
|
||||
|
||||
expect := func(t *testing.T, issue *issues_model.Issue, comment *issues_model.Comment, doer *user_model.User,
|
||||
actionType activities_model.ActionType, fromMention bool, tplSubject, tplBody, expSubject, expBody string,
|
||||
|
@ -343,7 +344,7 @@ func TestTemplateServices(t *testing.T) {
|
|||
|
||||
func testComposeIssueCommentMessage(t *testing.T, ctx *mailCommentContext, recipients []*user_model.User, fromMention bool, info string) *Message {
|
||||
msgs, err := composeIssueCommentMessages(ctx, "en-US", recipients, fromMention, info)
|
||||
assert.NoError(t, err)
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, msgs, 1)
|
||||
return msgs[0]
|
||||
}
|
||||
|
@ -492,7 +493,7 @@ func Test_createReference(t *testing.T) {
|
|||
|
||||
func TestFromDisplayName(t *testing.T) {
|
||||
template, err := texttmpl.New("mailFrom").Parse("{{ .DisplayName }}")
|
||||
assert.NoError(t, err)
|
||||
require.NoError(t, err)
|
||||
setting.MailService = &setting.Mailer{FromDisplayNameFormatTemplate: template}
|
||||
defer func() { setting.MailService = nil }()
|
||||
|
||||
|
@ -523,7 +524,7 @@ func TestFromDisplayName(t *testing.T) {
|
|||
|
||||
t.Run("template with all available vars", func(t *testing.T) {
|
||||
template, err = texttmpl.New("mailFrom").Parse("{{ .DisplayName }} (by {{ .AppName }} on [{{ .Domain }}])")
|
||||
assert.NoError(t, err)
|
||||
require.NoError(t, err)
|
||||
setting.MailService = &setting.Mailer{FromDisplayNameFormatTemplate: template}
|
||||
oldAppName := setting.AppName
|
||||
setting.AppName = "Code IT"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue