From 160ccb5ee2c9dce7e59fa2635c8539e0338d83ee Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Tue, 12 Nov 2024 13:41:22 +0800
Subject: [PATCH] Fix test fixtures for user2/lfs.git (#32477)
---
models/fixtures/lfs_meta_object.yml | 18 +-----------------
.../30/77e1c4c8964613df72c37d14275c1eda5228a9 | 2 --
.../6b/bc79965141058b0026f2064dfb6d2eae3c4540 | Bin 259 -> 0 bytes
.../b0/89e97ee59224e8c5676673c096ee4b6a8b9342 | Bin 123 -> 0 bytes
.../e9/c32647bab825977942598c0efa415de300304b | Bin 170 -> 0 bytes
.../user2/lfs.git/refs/heads/master | 2 +-
tests/integration/lfs_view_test.go | 17 ++++++++++++-----
7 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/30/77e1c4c8964613df72c37d14275c1eda5228a9
delete mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/6b/bc79965141058b0026f2064dfb6d2eae3c4540
delete mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/b0/89e97ee59224e8c5676673c096ee4b6a8b9342
delete mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/e9/c32647bab825977942598c0efa415de300304b
diff --git a/models/fixtures/lfs_meta_object.yml b/models/fixtures/lfs_meta_object.yml
index 5430506d70..ae5ae56542 100644
--- a/models/fixtures/lfs_meta_object.yml
+++ b/models/fixtures/lfs_meta_object.yml
@@ -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 <rowan.bohde@gmail.com>
-# Date: Thu Aug 1 14:38:23 2024 -0500
-#
-# add invalid lfs file
-
id: 1
@@ -18,7 +11,7 @@
id: 2
oid: 2eccdb43825d2a49d99d542daa20075cff1d97d9d2349a8977efe9c03661737c
- size: 107 # real size is 2048
+ size: 2048
repository_id: 54
created_unix: 1671607299
@@ -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
diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/30/77e1c4c8964613df72c37d14275c1eda5228a9 b/tests/gitea-repositories-meta/user2/lfs.git/objects/30/77e1c4c8964613df72c37d14275c1eda5228a9
deleted file mode 100644
index c2dc6e5a4f..0000000000
--- a/tests/gitea-repositories-meta/user2/lfs.git/objects/30/77e1c4c8964613df72c37d14275c1eda5228a9
+++ /dev/null
@@ -1,2 +0,0 @@
-xK��OR0�0`p�� �t
-
��s��MQH��)I-��I+VH�LK3rS��S�,ݒԊ.-���t"U&e��23�,1'�8���A�
\ No newline at end of file
diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/6b/bc79965141058b0026f2064dfb6d2eae3c4540 b/tests/gitea-repositories-meta/user2/lfs.git/objects/6b/bc79965141058b0026f2064dfb6d2eae3c4540
deleted file mode 100644
index 97455cbc46ed6801ec009d2a6b4cd2ce2347bcfa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 259
zcmV+e0sQ`W0V^p=O;s>5GiER}FfcPQQP4}zEJ-XWDauSLElDkAFera`<is>L;rm60
zYem#!<ZcCNtc0p`_V)`3@^lIf@$_@o%S~a>&dKpx_e*7yzQUx#SH0EjKjpuUfGQ1g
zb#(D{1u1GOyR>L}<@y;qT)(Dg->$R{y5h6~swlarvY<pSDKn4Z$`UDF-z`(-3C+Hw
z-!54AYDOdTd#Iw!yt2fc%oK(VoiFR2PEvVsG(D~Oz_fSXS>2PJph~g|Qq%Ra3ep)$
z6c<P=fBZ4-X{NlGF5ivXgEN{wm>2+oLUCzQN@fwmo~L{(J~6+WWE+*j%c{_|--yj4
J4*(iHX&$FKd=UTu
diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/b0/89e97ee59224e8c5676673c096ee4b6a8b9342 b/tests/gitea-repositories-meta/user2/lfs.git/objects/b0/89e97ee59224e8c5676673c096ee4b6a8b9342
deleted file mode 100644
index 33ab64e7303e418c3270708ab1134aa417e2f8a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 123
zcmV->0EGW|0S(H*5yBu406^bVK?4Ti;0Wo4<3N~+k`c_q>dk9EOM54&jlZ4wGg^Pk
zI_EJqrJilx_cE5t`lTiHml{V->eQk)mZL`Fa0{&cO0H=4um~0kgDKW&E&*anhL}S}
d@IcvKG2ohQij0J4Jvc2!`(<gI_yePiDF;b@I<No$
diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/e9/c32647bab825977942598c0efa415de300304b b/tests/gitea-repositories-meta/user2/lfs.git/objects/e9/c32647bab825977942598c0efa415de300304b
deleted file mode 100644
index f513e2a308b1e4dd23eb0a4c541dbafa619711f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 170
zcmV;b09F5Z0iBLpYQr!P0Q;>|>;)QDtA}L>CG-fnfu!AS1h!QiCB1%~E97$q2B!9P
zZ3D>7A7dARSW2DdIR@)3hExzKDq-}jB{E4CSAFnke)BHdfXP)w$0bS?=fzUd*-A>m
zaSci1l$10PoBSBJzQeWu<qf|3jRns83r^()m!CDa<y8Cn1$H6|-dc3<i2>0Z_Lv;<
YW^OVwwC$Of#<1uev@K%(0i~r&qPFu<cK`qY
diff --git a/tests/gitea-repositories-meta/user2/lfs.git/refs/heads/master b/tests/gitea-repositories-meta/user2/lfs.git/refs/heads/master
index 487a433af2..8832a3e857 100644
--- a/tests/gitea-repositories-meta/user2/lfs.git/refs/heads/master
+++ b/tests/gitea-repositories-meta/user2/lfs.git/refs/heads/master
@@ -1 +1 @@
-e9c32647bab825977942598c0efa415de300304b
+73cf03db6ece34e12bf91e8853dc58f678f2f82d
diff --git a/tests/integration/lfs_view_test.go b/tests/integration/lfs_view_test.go
index 05770e5e0a..a0e004ed58 100644
--- a/tests/integration/lfs_view_test.go
+++ b/tests/integration/lfs_view_test.go
@@ -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"
@@ -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")
})
}