mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 12:54:53 -05:00
[v7.0/forgejo] fix(ui): /settings/lfs/find 500 error (#3451)
When in the repository settings, visiting - `LFS` to `/{owner}/{repo}/settings/lfs` - `Find pointer files` to `/{owner}/{repo}/settings/lfs/pointers` - `Find commits` to `/{owner}/{repo}/settings/lfs/find?oid=...` failed with an error 500 because of an incorrect evaluation of the template. Regression introduced bycbf923e87b
A test is added to visit the page and guard against future regressions. Refs: https://codeberg.org/forgejo/forgejo/issues/3438 (cherry picked from commit078229a5e4
) Also has a backport of https://codeberg.org/forgejo/forgejo/pulls/3465/files to ensure the test fails. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3451 Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org> Co-authored-by: Earl Warren <contact@earl-warren.org> Co-committed-by: Earl Warren <contact@earl-warren.org>
This commit is contained in:
parent
5f0ae00efc
commit
5083ea72fb
2 changed files with 24 additions and 2 deletions
|
@ -23,9 +23,9 @@
|
|||
<span class="text grey">{{svg "octicon-git-branch"}}{{.BranchName}}</span>
|
||||
</td>
|
||||
<td>
|
||||
{{if .ParentHashes}}
|
||||
{{if .ParentIDs}}
|
||||
{{ctx.Locale.Tr "repo.diff.parent"}}
|
||||
{{range .ParentHashes}}
|
||||
{{range .ParentIDs}}
|
||||
<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.String}}">{{ShortSha .String}}</a>
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
|
|
@ -80,4 +80,26 @@ func TestLFSRender(t *testing.T) {
|
|||
content := doc.Find("div.file-view").Text()
|
||||
assert.Contains(t, content, "Testing READMEs in LFS")
|
||||
})
|
||||
|
||||
t.Run("/settings/lfs/pointers", func(t *testing.T) {
|
||||
defer tests.PrintCurrentTest(t)()
|
||||
|
||||
// visit /user2/lfs/settings/lfs/pointer
|
||||
req := NewRequest(t, "GET", "/user2/lfs/settings/lfs/pointers")
|
||||
resp := session.MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
// follow the first link to /user2/lfs/settings/lfs/find?oid=....
|
||||
filesTable := NewHTMLParser(t, resp.Body).doc.Find("#lfs-files-table")
|
||||
assert.Contains(t, filesTable.Text(), "Find commits")
|
||||
lfsFind := filesTable.Find(`.primary.button[href^="/user2"]`)
|
||||
assert.Greater(t, lfsFind.Length(), 0)
|
||||
lfsFindPath, exists := lfsFind.First().Attr("href")
|
||||
assert.True(t, exists)
|
||||
|
||||
assert.Contains(t, lfsFindPath, "oid=")
|
||||
req = NewRequest(t, "GET", lfsFindPath)
|
||||
resp = session.MakeRequest(t, req, http.StatusOK)
|
||||
doc := NewHTMLParser(t, resp.Body).doc
|
||||
assert.Equal(t, 1, doc.Find(`.sha.label[href="/user2/lfs/commit/73cf03db6ece34e12bf91e8853dc58f678f2f82d"]`).Length(), "could not find link to commit")
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue