davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-05-28 03:00:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

enable linter testifylint on v7 (#4572)

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4572
Co-authored-by: TheFox0x7 <thefox0x7@gmail.com>
Co-committed-by: TheFox0x7 <thefox0x7@gmail.com>
This commit is contained in:
TheFox0x7 2024-07-30 19:42:06 +00:00 • committed by Earl Warren
parent c47bdf436b
commit 072dd9f8bc
494 changed files with 4897 additions and 4554 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/markup/console/console_test.go
View file

@ -11,6 +11,7 @@ import (
"code.gitea.io/gitea/modules/markup"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestRenderConsole(t *testing.T) {
@ -26,7 +27,7 @@ func TestRenderConsole(t *testing.T) {
err := render.Render(&markup.RenderContext{Ctx: git.DefaultContext},
strings.NewReader(k), &buf)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualValues(t, v, buf.String())
}
}

5
modules/markup/csv/csv_test.go
View file

@ -13,6 +13,7 @@ import (
"code.gitea.io/gitea/modules/markup"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestRenderCSV(t *testing.T) {
@ -28,14 +29,14 @@ func TestRenderCSV(t *testing.T) {
var buf strings.Builder
err := render.Render(&markup.RenderContext{Ctx: git.DefaultContext},
strings.NewReader(k), &buf)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualValues(t, v, buf.String())
}
t.Run("fallbackRender", func(t *testing.T) {
var buf bytes.Buffer
err := render.fallbackRender(strings.NewReader("1,<a>\n2,<b>"), bufio.NewWriter(&buf))
assert.NoError(t, err)
require.NoError(t, err)
want := "<pre>1,&lt;a&gt;\n2,&lt;b&gt;</pre>"
assert.Equal(t, want, buf.String())
})

9
modules/markup/html_internal_test.go
View file

@ -14,6 +14,7 @@ import (
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
const (
@ -294,7 +295,7 @@ func testRenderIssueIndexPattern(t *testing.T, input, expected string, ctx *Rend
var buf strings.Builder
err := postProcess(ctx, []processor{issueIndexPatternProcessor}, strings.NewReader(input), &buf)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expected, buf.String(), "input=%q", input)
}
@ -310,7 +311,7 @@ func TestRender_AutoLink(t *testing.T) {
},
Metas: localMetas,
}, strings.NewReader(input), &buffer)
assert.Equal(t, err, nil)
require.NoError(t, err, nil)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer.String()))
buffer.Reset()
@ -322,7 +323,7 @@ func TestRender_AutoLink(t *testing.T) {
Metas: localMetas,
IsWiki: true,
}, strings.NewReader(input), &buffer)
assert.Equal(t, err, nil)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer.String()))
}
@ -353,7 +354,7 @@ func TestRender_FullIssueURLs(t *testing.T) {
},
Metas: localMetas,
}, []processor{fullIssuePatternProcessor}, strings.NewReader(input), &result)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expected, result.String())
}
test("Here is a link https://git.osgeo.org/gogs/postgis/postgis/pulls/6",

34
modules/markup/html_test.go
View file

@ -51,7 +51,7 @@ func TestRender_Commits(t *testing.T) {
},
Metas: localMetas,
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}
@ -105,7 +105,7 @@ func TestRender_CrossReferences(t *testing.T) {
},
Metas: localMetas,
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}
@ -151,7 +151,7 @@ func TestRender_links(t *testing.T) {
Base: markup.TestRepoURL,
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}
// Text that should be turned into URL
@ -253,7 +253,7 @@ func TestRender_email(t *testing.T) {
Base: markup.TestRepoURL,
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(res))
}
// Text that should be turned into email link
@ -326,7 +326,7 @@ func TestRender_emoji(t *testing.T) {
Base: markup.TestRepoURL,
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}
@ -392,7 +392,7 @@ func TestRender_ShortLinks(t *testing.T) {
BranchPath: "master",
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer)))
buffer, err = markdown.RenderString(&markup.RenderContext{
Ctx: git.DefaultContext,
@ -402,7 +402,7 @@ func TestRender_ShortLinks(t *testing.T) {
Metas: localMetas,
IsWiki: true,
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expectedWiki), strings.TrimSpace(string(buffer)))
}
@ -505,7 +505,7 @@ func TestRender_RelativeImages(t *testing.T) {
},
Metas: localMetas,
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer)))
buffer, err = markdown.RenderString(&markup.RenderContext{
Ctx: git.DefaultContext,
@ -515,7 +515,7 @@ func TestRender_RelativeImages(t *testing.T) {
Metas: localMetas,
IsWiki: true,
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expectedWiki), strings.TrimSpace(string(buffer)))
}
@ -551,7 +551,7 @@ func Test_ParseClusterFuzz(t *testing.T) {
},
Metas: localMetas,
}, strings.NewReader(data), &res)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotContains(t, res.String(), "<html")
data = "<!DOCTYPE html>\n<A><maTH><tr><MN><bodY ÿ><temPlate></template><tH><tr></A><tH><d<bodY "
@ -565,7 +565,7 @@ func Test_ParseClusterFuzz(t *testing.T) {
Metas: localMetas,
}, strings.NewReader(data), &res)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotContains(t, res.String(), "<html")
}
@ -589,7 +589,7 @@ func TestPostProcess_RenderDocument(t *testing.T) {
},
Metas: localMetas,
}, strings.NewReader(input), &res)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(res.String()))
}
@ -629,7 +629,7 @@ func TestIssue16020(t *testing.T) {
Ctx: git.DefaultContext,
Metas: localMetas,
}, strings.NewReader(data), &res)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, data, res.String())
}
@ -645,7 +645,7 @@ func BenchmarkEmojiPostprocess(b *testing.B) {
Ctx: git.DefaultContext,
Metas: localMetas,
}, strings.NewReader(data), &res)
assert.NoError(b, err)
require.NoError(b, err)
}
}
@ -664,7 +664,7 @@ func TestFuzz(t *testing.T) {
err := markup.PostProcess(&renderContext, strings.NewReader(s), io.Discard)
assert.NoError(t, err)
require.NoError(t, err)
}
func TestIssue18471(t *testing.T) {
@ -676,7 +676,7 @@ func TestIssue18471(t *testing.T) {
Metas: localMetas,
}, strings.NewReader(data), &res)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "<a href=\"http://domain/org/repo/compare/783b039...da951ce\" class=\"compare\"><code class=\"nohighlight\">783b039...da951ce</code></a>", res.String())
}
@ -712,7 +712,7 @@ func TestRender_FilePreview(t *testing.T) {
RelativePath: ".md",
Metas: metas,
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}

41
modules/markup/markdown/markdown_test.go
View file

@ -20,6 +20,7 @@ import (
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
const (
@ -57,7 +58,7 @@ func TestRender_StandardLinks(t *testing.T) {
Base: FullURL,
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer)))
buffer, err = markdown.RenderString(&markup.RenderContext{
@ -67,7 +68,7 @@ func TestRender_StandardLinks(t *testing.T) {
},
IsWiki: true,
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expectedWiki), strings.TrimSpace(string(buffer)))
}
@ -91,7 +92,7 @@ func TestRender_Images(t *testing.T) {
Base: FullURL,
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer)))
}
@ -300,7 +301,7 @@ func TestTotal_RenderWiki(t *testing.T) {
Metas: localMetas,
IsWiki: true,
}, sameCases[i])
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, template.HTML(answers[i]), line)
}
@ -325,7 +326,7 @@ func TestTotal_RenderWiki(t *testing.T) {
},
IsWiki: true,
}, testCases[i])
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, template.HTML(testCases[i+1]), line)
}
}
@ -344,7 +345,7 @@ func TestTotal_RenderString(t *testing.T) {
},
Metas: localMetas,
}, sameCases[i])
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, template.HTML(answers[i]), line)
}
@ -357,7 +358,7 @@ func TestTotal_RenderString(t *testing.T) {
Base: FullURL,
},
}, testCases[i])
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, template.HTML(testCases[i+1]), line)
}
}
@ -365,17 +366,17 @@ func TestTotal_RenderString(t *testing.T) {
func TestRender_RenderParagraphs(t *testing.T) {
test := func(t *testing.T, str string, cnt int) {
res, err := markdown.RenderRawString(&markup.RenderContext{Ctx: git.DefaultContext}, str)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, cnt, strings.Count(res, "<p"), "Rendered result for unix should have %d paragraph(s) but has %d:\n%s\n", cnt, strings.Count(res, "<p"), res)
mac := strings.ReplaceAll(str, "\n", "\r")
res, err = markdown.RenderRawString(&markup.RenderContext{Ctx: git.DefaultContext}, mac)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, cnt, strings.Count(res, "<p"), "Rendered result for mac should have %d paragraph(s) but has %d:\n%s\n", cnt, strings.Count(res, "<p"), res)
dos := strings.ReplaceAll(str, "\n", "\r\n")
res, err = markdown.RenderRawString(&markup.RenderContext{Ctx: git.DefaultContext}, dos)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, cnt, strings.Count(res, "<p"), "Rendered result for windows should have %d paragraph(s) but has %d:\n%s\n", cnt, strings.Count(res, "<p"), res)
}
@ -403,7 +404,7 @@ func TestMarkdownRenderRaw(t *testing.T) {
for _, testcase := range testcases {
log.Info("Test markdown render error with fuzzy data: %x, the following errors can be recovered", testcase)
_, err := markdown.RenderRawString(&markup.RenderContext{Ctx: git.DefaultContext}, string(testcase))
assert.NoError(t, err)
require.NoError(t, err)
}
}
@ -415,7 +416,7 @@ func TestRenderSiblingImages_Issue12925(t *testing.T) {
<a href="/image2" target="_blank" rel="nofollow noopener"><img src="/image2" alt="image2"></a></p>
`
res, err := markdown.RenderRawString(&markup.RenderContext{Ctx: git.DefaultContext}, testcase)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expected, res)
}
@ -424,7 +425,7 @@ func TestRenderEmojiInLinks_Issue12331(t *testing.T) {
expected := `<p><a href="https://gitea.io" rel="nofollow">Link with emoji <span class="emoji" aria-label="waxing gibbous moon">🌔</span> in text</a></p>
`
res, err := markdown.RenderString(&markup.RenderContext{Ctx: git.DefaultContext}, testcase)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, template.HTML(expected), res)
}
@ -458,7 +459,7 @@ func TestColorPreview(t *testing.T) {
for _, test := range positiveTests {
res, err := markdown.RenderString(&markup.RenderContext{Ctx: git.DefaultContext}, test.testcase)
assert.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
require.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
assert.Equal(t, template.HTML(test.expected), res, "Unexpected result in testcase %q", test.testcase)
}
@ -478,7 +479,7 @@ func TestColorPreview(t *testing.T) {
for _, test := range negativeTests {
res, err := markdown.RenderString(&markup.RenderContext{Ctx: git.DefaultContext}, test)
assert.NoError(t, err, "Unexpected error in testcase: %q", test)
require.NoError(t, err, "Unexpected error in testcase: %q", test)
assert.NotContains(t, res, `<span class="color-preview" style="background-color: `, "Unexpected result in testcase %q", test)
}
}
@ -557,7 +558,7 @@ func TestMathBlock(t *testing.T) {
for _, test := range testcases {
res, err := markdown.RenderString(&markup.RenderContext{Ctx: git.DefaultContext}, test.testcase)
assert.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
require.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
assert.Equal(t, template.HTML(test.expected), res, "Unexpected result in testcase %q", test.testcase)
}
@ -756,7 +757,7 @@ Citation needed[^0].`,
}
for _, test := range testcases {
res, err := markdown.RenderString(&markup.RenderContext{Ctx: git.DefaultContext}, test.testcase)
assert.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
require.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
assert.Equal(t, test.expected, string(res), "Unexpected result in testcase %q", test.testcase)
}
}
@ -793,7 +794,7 @@ foo: bar
for _, test := range testcases {
res, err := markdown.RenderString(&markup.RenderContext{Ctx: git.DefaultContext}, test.testcase)
assert.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
require.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
assert.Equal(t, template.HTML(test.expected), res, "Unexpected result in testcase %q", test.testcase)
}
}
@ -1184,7 +1185,7 @@ space</p>
for i, c := range cases {
result, err := markdown.RenderString(&markup.RenderContext{Ctx: context.Background(), Links: c.Links, IsWiki: c.IsWiki}, input)
assert.NoError(t, err, "Unexpected error in testcase: %v", i)
require.NoError(t, err, "Unexpected error in testcase: %v", i)
assert.Equal(t, template.HTML(c.Expected), result, "Unexpected result in testcase %v", i)
}
}
@ -1201,7 +1202,7 @@ func TestCustomMarkdownURL(t *testing.T) {
BranchPath: "branch/main",
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer)))
}

17
modules/markup/markdown/meta_test.go
View file

@ -9,6 +9,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
/*
@ -31,7 +32,7 @@ func TestExtractMetadata(t *testing.T) {
t.Run("ValidFrontAndBody", func(t *testing.T) {
var meta IssueTemplate
body, err := ExtractMetadata(fmt.Sprintf("%s\n%s\n%s\n%s", sepTest, frontTest, sepTest, bodyTest), &meta)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, bodyTest, body)
assert.Equal(t, metaTest, meta)
assert.True(t, meta.Valid())
@ -40,19 +41,19 @@ func TestExtractMetadata(t *testing.T) {
t.Run("NoFirstSeparator", func(t *testing.T) {
var meta IssueTemplate
_, err := ExtractMetadata(fmt.Sprintf("%s\n%s\n%s", frontTest, sepTest, bodyTest), &meta)
assert.Error(t, err)
require.Error(t, err)
})
t.Run("NoLastSeparator", func(t *testing.T) {
var meta IssueTemplate
_, err := ExtractMetadata(fmt.Sprintf("%s\n%s\n%s", sepTest, frontTest, bodyTest), &meta)
assert.Error(t, err)
require.Error(t, err)
})
t.Run("NoBody", func(t *testing.T) {
var meta IssueTemplate
body, err := ExtractMetadata(fmt.Sprintf("%s\n%s\n%s", sepTest, frontTest, sepTest), &meta)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "", body)
assert.Equal(t, metaTest, meta)
assert.True(t, meta.Valid())
@ -63,7 +64,7 @@ func TestExtractMetadataBytes(t *testing.T) {
t.Run("ValidFrontAndBody", func(t *testing.T) {
var meta IssueTemplate
body, err := ExtractMetadataBytes([]byte(fmt.Sprintf("%s\n%s\n%s\n%s", sepTest, frontTest, sepTest, bodyTest)), &meta)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, bodyTest, string(body))
assert.Equal(t, metaTest, meta)
assert.True(t, meta.Valid())
@ -72,19 +73,19 @@ func TestExtractMetadataBytes(t *testing.T) {
t.Run("NoFirstSeparator", func(t *testing.T) {
var meta IssueTemplate
_, err := ExtractMetadataBytes([]byte(fmt.Sprintf("%s\n%s\n%s", frontTest, sepTest, bodyTest)), &meta)
assert.Error(t, err)
require.Error(t, err)
})
t.Run("NoLastSeparator", func(t *testing.T) {
var meta IssueTemplate
_, err := ExtractMetadataBytes([]byte(fmt.Sprintf("%s\n%s\n%s", sepTest, frontTest, bodyTest)), &meta)
assert.Error(t, err)
require.Error(t, err)
})
t.Run("NoBody", func(t *testing.T) {
var meta IssueTemplate
body, err := ExtractMetadataBytes([]byte(fmt.Sprintf("%s\n%s\n%s", sepTest, frontTest, sepTest)), &meta)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "", string(body))
assert.Equal(t, metaTest, meta)
assert.True(t, meta.Valid())

11
modules/markup/orgmode/orgmode_test.go
View file

@ -13,6 +13,7 @@ import (
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
const (
@ -32,7 +33,7 @@ func TestRender_StandardLinks(t *testing.T) {
Base: setting.AppSubURL,
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}
@ -60,7 +61,7 @@ func TestRender_BaseLinks(t *testing.T) {
BranchPath: "branch/main",
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}
@ -73,7 +74,7 @@ func TestRender_BaseLinks(t *testing.T) {
TreePath: "deep/nested/folder",
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}
@ -99,7 +100,7 @@ func TestRender_Media(t *testing.T) {
Base: setting.AppSubURL,
},
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}
@ -140,7 +141,7 @@ func TestRender_Source(t *testing.T) {
buffer, err := RenderString(&markup.RenderContext{
Ctx: git.DefaultContext,
}, input)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
}