Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test fixtures for user2/lfs.git #32477

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Fix test fixtures for user2/lfs.git #32477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e8c40e
fix
wxiaoguang Nov 12, 2024
1dbd9aa
Merge branch 'main' into fix-test-lfs
wxiaoguang Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions models/fixtures/lfs_meta_object.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
# These are the LFS objects in user2/lfs.git
# user2/lfs is an INVALID repository
#
# commit e9c32647bab825977942598c0efa415de300304b (HEAD -> master)
# Author: Rowan Bohde <[email protected]>
# Date: Thu Aug 1 14:38:23 2024 -0500
#
# add invalid lfs file
-

id: 1
Expand All @@ -18,7 +11,7 @@

id: 2
oid: 2eccdb43825d2a49d99d542daa20075cff1d97d9d2349a8977efe9c03661737c
size: 107 # real size is 2048
size: 2048
repository_id: 54
created_unix: 1671607299

Expand All @@ -37,12 +30,3 @@
size: 25
repository_id: 54
created_unix: 1671607299

# this file is missing
# -
#
# id: 5
# oid: 9d178b5f15046343fd32f451df93acc2bdd9e6373be478b968e4cad6b6647351
# size: 25
# repository_id: 54
# created_unix: 1671607299
2 changes: 0 additions & 2 deletions ...s/gitea-repositories-meta/user2/lfs.git/objects/30/77e1c4c8964613df72c37d14275c1eda5228a9
View file
Open in desktop

This file was deleted.

Binary file removed ...s/gitea-repositories-meta/user2/lfs.git/objects/6b/bc79965141058b0026f2064dfb6d2eae3c4540
View file
Open in desktop
Binary file not shown.
Binary file removed ...s/gitea-repositories-meta/user2/lfs.git/objects/b0/89e97ee59224e8c5676673c096ee4b6a8b9342
View file
Open in desktop
Binary file not shown.
Binary file removed ...s/gitea-repositories-meta/user2/lfs.git/objects/e9/c32647bab825977942598c0efa415de300304b
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/gitea-repositories-meta/user2/lfs.git/refs/heads/master
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e9c32647bab825977942598c0efa415de300304b
73cf03db6ece34e12bf91e8853dc58f678f2f82d
17 changes: 12 additions & 5 deletions tests/integration/lfs_view_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
"strings"
"testing"

"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/git"
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
Expand Down Expand Up @@ -94,13 +96,18 @@ func TestLFSRender(t *testing.T) {
t.Run("Invalid", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()

req := NewRequest(t, "GET", "/user2/lfs/src/branch/master/invalid")
// the LFS exists
req := NewRequest(t, "GET", "/user2/lfs/src/branch/master/CONTRIBUTING.md")
resp := session.MakeRequest(t, req, http.StatusOK)
content := NewHTMLParser(t, resp.Body).Find("div.file-view").Text()
assert.Contains(t, content, "Testing documents in LFS")

doc := NewHTMLParser(t, resp.Body).doc

content := doc.Find("div.file-view").Text()
assert.Contains(t, content, "oid sha256:9d178b5f15046343fd32f451df93acc2bdd9e6373be478b968e4cad6b6647351")
// then make it disappear
assert.NoError(t, db.TruncateBeans(db.DefaultContext, &git.LFSMetaObject{}))
req = NewRequest(t, "GET", "/user2/lfs/src/branch/master/CONTRIBUTING.md")
resp = session.MakeRequest(t, req, http.StatusOK)
content = NewHTMLParser(t, resp.Body).Find("div.file-view").Text()
assert.Contains(t, content, "oid sha256:7b6b2c88dba9f760a1a58469b67fee2b698ef7e9399c4ca4f34a14ccbe39f623")
})
}

Expand Down
Loading