From a2779def36590518157c4315a02e7cbaefcecb92 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 22 Dec 2022 18:41:56 -0500 Subject: [PATCH] Test views of LFS files (#22196) --- CONTRIBUTING.md | 2 + models/db/iterate_test.go | 2 +- models/fixtures/lfs_meta_object.yml | 32 +++++++ models/fixtures/repo_unit.yml | 6 ++ models/fixtures/repository.yml | 11 +++ models/fixtures/user.yml | 2 +- ...51df93acc2bdd9e6373be478b968e4cad6b6647351 | Bin 0 -> 107 bytes ...2daa20075cff1d97d9d2349a8977efe9c03661737c | Bin 0 -> 2048 bytes ...69b67fee2b698ef7e9399c4ca4f34a14ccbe39f623 | 1 + ...ec6afe9ea052f3c9b6ff9f4b07956d8c48c86fca82 | 1 + .../user2/lfs.git/HEAD | 1 + .../user2/lfs.git/config | 4 + .../15/2de0f78bc6815b58cd9f08aebe3f66fb0f172e | Bin 0 -> 228 bytes .../23/10e4a07f9314a1a92fdfbdcd3d2884f01e96ab | Bin 0 -> 123 bytes .../2b/6c6c4eaefa24b22f2092c3d54b263ff26feb58 | Bin 0 -> 122 bytes .../73/cf03db6ece34e12bf91e8853dc58f678f2f82d | 2 + .../74/21a018a7e3f15ee5691f162d0ed87dc19882f0 | Bin 0 -> 123 bytes .../82/76d2a29779af982c0afa976bdb793b52d442a8 | Bin 0 -> 38 bytes .../bc/e50ea8f203ee923d5a640d05208abf3206486e | Bin 0 -> 92 bytes .../d4/a41a0d4db4949e129bd22f871171ea988103ef | Bin 0 -> 123 bytes .../d7/ce0013ced38b0696dd2d68d69a5d8b652f7148 | Bin 0 -> 55 bytes .../df/d8105b264d304c49ed9f1d56bd90189ecdf833 | Bin 0 -> 75 bytes .../user2/lfs.git/refs/heads/master | 1 + tests/integration/lfs_view_test.go | 83 ++++++++++++++++++ tests/test_utils.go | 28 ++++++ 25 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 models/fixtures/lfs_meta_object.yml create mode 100644 tests/gitea-lfs-meta/0b/8d/8b5f15046343fd32f451df93acc2bdd9e6373be478b968e4cad6b6647351 create mode 100644 tests/gitea-lfs-meta/2e/cc/db43825d2a49d99d542daa20075cff1d97d9d2349a8977efe9c03661737c create mode 100644 tests/gitea-lfs-meta/7b/6b/2c88dba9f760a1a58469b67fee2b698ef7e9399c4ca4f34a14ccbe39f623 create mode 100644 tests/gitea-lfs-meta/9d/17/2e5c64b4f0024b9901ec6afe9ea052f3c9b6ff9f4b07956d8c48c86fca82 create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/HEAD create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/config create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/15/2de0f78bc6815b58cd9f08aebe3f66fb0f172e create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/23/10e4a07f9314a1a92fdfbdcd3d2884f01e96ab create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/2b/6c6c4eaefa24b22f2092c3d54b263ff26feb58 create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/73/cf03db6ece34e12bf91e8853dc58f678f2f82d create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/74/21a018a7e3f15ee5691f162d0ed87dc19882f0 create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/82/76d2a29779af982c0afa976bdb793b52d442a8 create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/bc/e50ea8f203ee923d5a640d05208abf3206486e create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/d4/a41a0d4db4949e129bd22f871171ea988103ef create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/d7/ce0013ced38b0696dd2d68d69a5d8b652f7148 create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/objects/df/d8105b264d304c49ed9f1d56bd90189ecdf833 create mode 100644 tests/gitea-repositories-meta/user2/lfs.git/refs/heads/master create mode 100644 tests/integration/lfs_view_test.go diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 69363c415e..bd5672643a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -190,6 +190,8 @@ To maintain understandable code and avoid circular dependencies it is important - **templates:** Golang templates for generating the html output. - **tests/e2e:** End to end tests - **tests/integration:** Integration tests +- **tests/gitea-repositories-meta:** Sample repos used in integration tests. Adding a new repo requires editing `models/fixtures/repositories.yml` and `models/fixtures/repo_unit.yml` to match. +- **tests/gitea-lfs-meta:** Sample LFS objects used in integration tests. Adding a new object requires editing `models/fixtures/lfs_meta_object.yml` to match. - **vendor:** External code that Gitea depends on. ## Documentation diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go index 57b1bd3cd1..63487afa49 100644 --- a/models/db/iterate_test.go +++ b/models/db/iterate_test.go @@ -25,7 +25,7 @@ func TestIterate(t *testing.T) { return nil }) assert.NoError(t, err) - assert.EqualValues(t, 80, repoCnt) + assert.EqualValues(t, 81, repoCnt) err = db.Iterate(db.DefaultContext, nil, func(ctx context.Context, repoUnit *repo_model.RepoUnit) error { reopUnit2 := repo_model.RepoUnit{ID: repoUnit.ID} diff --git a/models/fixtures/lfs_meta_object.yml b/models/fixtures/lfs_meta_object.yml new file mode 100644 index 0000000000..1c29e02d44 --- /dev/null +++ b/models/fixtures/lfs_meta_object.yml @@ -0,0 +1,32 @@ +# These are the LFS objects in user2/lfs.git +- + + id: 1 + oid: 0b8d8b5f15046343fd32f451df93acc2bdd9e6373be478b968e4cad6b6647351 + size: 107 + repository_id: 54 + created_unix: 1671607299 + +- + + id: 2 + oid: 2eccdb43825d2a49d99d542daa20075cff1d97d9d2349a8977efe9c03661737c + size: 107 + repository_id: 54 + created_unix: 1671607299 + +- + + id: 3 + oid: 7b6b2c88dba9f760a1a58469b67fee2b698ef7e9399c4ca4f34a14ccbe39f623 + size: 27 + repository_id: 54 + created_unix: 1671607299 + +- + + id: 4 + oid: 9d172e5c64b4f0024b9901ec6afe9ea052f3c9b6ff9f4b07956d8c48c86fca82 + size: 25 + repository_id: 54 + created_unix: 1671607299 diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index 73db47218b..8706717ad4 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -550,3 +550,9 @@ repo_id: 53 type: 1 created_unix: 946684810 + +- + id: 81 + repo_id: 54 + type: 1 + created_unix: 946684810 diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml index a5a3dd0601..19b243fb4e 100644 --- a/models/fixtures/repository.yml +++ b/models/fixtures/repository.yml @@ -1585,3 +1585,14 @@ size: 0 is_fsck_enabled: true close_issues_via_commit_in_any_branch: false + +- + id: 54 + owner_id: 2 + owner_name: user2 + lower_name: lfs + name: lfs + is_empty: false + is_archived: false + is_private: true + status: 0 diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml index 1b870e8999..3afed37df9 100644 --- a/models/fixtures/user.yml +++ b/models/fixtures/user.yml @@ -66,7 +66,7 @@ num_followers: 2 num_following: 1 num_stars: 2 - num_repos: 9 + num_repos: 10 num_teams: 0 num_members: 0 visibility: 0 diff --git a/tests/gitea-lfs-meta/0b/8d/8b5f15046343fd32f451df93acc2bdd9e6373be478b968e4cad6b6647351 b/tests/gitea-lfs-meta/0b/8d/8b5f15046343fd32f451df93acc2bdd9e6373be478b968e4cad6b6647351 new file mode 100644 index 0000000000000000000000000000000000000000..71911bf48766c7181518c1070911019fbb00b1fc GIT binary patch literal 107 zcmex=v6O#mT|R$;HFZ!^O?V&B@6t$jiqs zARs8f#UmsvBp}Q$ARzGnBm*}G10w??BcmY0|1%713<3hI|8FsHFfuYQ*fU%@ukimS E0KS6{<^TWy literal 0 HcmV?d00001 diff --git a/tests/gitea-lfs-meta/2e/cc/db43825d2a49d99d542daa20075cff1d97d9d2349a8977efe9c03661737c b/tests/gitea-lfs-meta/2e/cc/db43825d2a49d99d542daa20075cff1d97d9d2349a8977efe9c03661737c new file mode 100644 index 0000000000000000000000000000000000000000..1e16a25b6a867693f91704eb211f8887ca0b270a GIT binary patch literal 2048 zcmWe|)U&=G>XWq5;Bu20)KRM%)_HO=#w{~AI|9j$Yzr@_A&DT^{_%kU5o5wc&KYYd^&@nwzV`JILoDMO$ zk9Au@&$%tzv!k+O-k#n|E}tGIF1yry-PO`FFz!1e=O<-x>1RI-IQFa(+WBh!Q|41P zb|cO%F<2OJY&`y@2Ifd^Sb8e1EoU; zl}@`p-Q+v*O>GI!nS7tRDFzpl_oi!@8=Ychd}AyhIQ8e>8uQnWr3=0nFKRculr@z# zeANQZ?}-l#e^oTRCb}U?s9j=@it2&v5_?fLmAUres_~WS;bxXDciwr) z8rJ>QxM}&y_&`To*|S2C!q+PgzigVmC?KJq<*N24(XU_5ofQ8n)yS{Mwlzy%WVZ~T9Y_KX1bkYlK#`Bmgeo3 zwFS?9F-_5`-=@nN{$|&8NB!MC^B8s>+S}dN6|cEx$*W>>uII7KR&L$-^mlc$Qp~-_ z%clly`1zu_bzOGX^<9dmW_Qh~7QJYBXcCWbf$}XOi6emxoPA z@$mG7_H7?u>mDvjoOIkZ?BmwYbEOJe+I6JE#3dt5bx-Q)7W&_k)MDXSzoI_9wID1{ zJ8An&?oiZk$)&-f?Q$vwL0M-YbEJT~!a>TYhfAMwT~bhi<0* z{PS_{rhwGdTJ93Rcut+zxN*&gGSgf0W}Tb#Y@-GnbB&+f-1xJ_ZVlc$Rb(EA9G2c- zBXVhDK#cif!$jt&tKXNUs{h{JD#c$o`^snDt>vy4r+(QgusNT-cy6QFc7=DG{kzVb zI&s75K}xlrW}(^5WBxhY7V!yAeSO32%#y`1?Cs)<{aRo2e3IGZb3)d&%s%m=k+|pg z=bYQU+7|xUkT?7M>(YgP_r7rOD7-Vxm}^Bp>#2?Jcf0z_ymR;@a81kOMk0^QV>9Df zp;EJq&*ZLXTASE5!O7fr|Agz;PA!wms?oLJ5p|M_efwCZPH{n(P`wW0#*;;F{bc?6 zbbU2KEppiuN;1y>s(q8=a=c{rmBohdEk2am)JmuB(seibc+g|z)mqW`|5|V6-*9Wb z9`t5Qd&tF&vERbok9hP9GHVa?|Iz6CZvEncx%UbmzS>mrL07{b`H4 z4D*8hk10-Q-}8dYZP{zaS?xZ7X4j8~9@+Aq!Sn~`Ij(50&d4_=LNghx!ql4I+qt^V z@S9ulFe#}1&fK^Ik_IQ9?l^6|H(>%(zVHfLv#n*h#ibShW##v(V8_kHssnJ1f22!}K#qCF=RE z2lGl4c`sXXxa_}PD{@J7GRwY`b@F+q&U~>94yMKVEc(ZkoL#Z*}8=w0~xfOQddUF5fPYAMi=DR)6CBS2w)d zMDE?)(ru}>(Tt6?uV?F_{}rM$fA{;xhaEfi+TU(L+r~RQk{5PfI8dxw^)}Z|ZJN%< zT(0B4ny){XIsEcX7fY6N`RWfBF0B*u&I@K%{?>KzZ^CbL=9sD6SzDTp{`jf?&wrc5 z1xKFh_tn=dZ|r#J7ama&p&L2PjPMmOj?oTHeKDa`0pDiBgNx z4|=7e1KY364KuNL!Em`Idxuv?#jZt*`hN;Nk*RV2-De@SqG-~pJ@;jAzgx$8xmn#- z$9%1*^@ID?2RAV9%GIlxa5?OKNJgp6nKQg@TRAP0XUaX+Pjx=#x6jC5J*klKLCIgU zIj?Wc5?=9e*7rN0Yz#rCL`S27RSJt;CXQ#gCcvQ0G3 z(xmp@@`XFLJznxi;-a#zbn*PX=epge%jM*Y<*hi`c-EI?+TrH1rmg4xmV8UQ@%i1x z1Lx`-tt#K_tiN~tdjjv}du4xLyu3U8?Mk)}AyZ1buJB~+i9FGG>+0(d2Ab*}$-Cpu i_Bi?{#FaKYeIeTQToM4NWd+gz literal 0 HcmV?d00001 diff --git a/tests/gitea-lfs-meta/7b/6b/2c88dba9f760a1a58469b67fee2b698ef7e9399c4ca4f34a14ccbe39f623 b/tests/gitea-lfs-meta/7b/6b/2c88dba9f760a1a58469b67fee2b698ef7e9399c4ca4f34a14ccbe39f623 new file mode 100644 index 0000000000..378de496da --- /dev/null +++ b/tests/gitea-lfs-meta/7b/6b/2c88dba9f760a1a58469b67fee2b698ef7e9399c4ca4f34a14ccbe39f623 @@ -0,0 +1 @@ +# Testing documents in LFS diff --git a/tests/gitea-lfs-meta/9d/17/2e5c64b4f0024b9901ec6afe9ea052f3c9b6ff9f4b07956d8c48c86fca82 b/tests/gitea-lfs-meta/9d/17/2e5c64b4f0024b9901ec6afe9ea052f3c9b6ff9f4b07956d8c48c86fca82 new file mode 100644 index 0000000000..7eb6670a31 --- /dev/null +++ b/tests/gitea-lfs-meta/9d/17/2e5c64b4f0024b9901ec6afe9ea052f3c9b6ff9f4b07956d8c48c86fca82 @@ -0,0 +1 @@ +# Testing READMEs in LFS diff --git a/tests/gitea-repositories-meta/user2/lfs.git/HEAD b/tests/gitea-repositories-meta/user2/lfs.git/HEAD new file mode 100644 index 0000000000..cb089cd89a --- /dev/null +++ b/tests/gitea-repositories-meta/user2/lfs.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/tests/gitea-repositories-meta/user2/lfs.git/config b/tests/gitea-repositories-meta/user2/lfs.git/config new file mode 100644 index 0000000000..07d359d07c --- /dev/null +++ b/tests/gitea-repositories-meta/user2/lfs.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/15/2de0f78bc6815b58cd9f08aebe3f66fb0f172e b/tests/gitea-repositories-meta/user2/lfs.git/objects/15/2de0f78bc6815b58cd9f08aebe3f66fb0f172e new file mode 100644 index 0000000000000000000000000000000000000000..d6657772ed5f00e215f1c04da59138a524ac54d7 GIT binary patch literal 228 zcmb_ZFYPJX=o-SksxwXL4*>#J7ZtUpyR%NQ#4 zo+edT?48XOkx mFws=q+>v-bc%SI}8TWlR^?E%_4SjJd|H!k6>r literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/2b/6c6c4eaefa24b22f2092c3d54b263ff26feb58 b/tests/gitea-repositories-meta/user2/lfs.git/objects/2b/6c6c4eaefa24b22f2092c3d54b263ff26feb58 new file mode 100644 index 0000000000000000000000000000000000000000..d8d55b14fa1bc6ff5d781be1e48f53561c2304de GIT binary patch literal 122 zcmbjI)ChmwQmmR94C$S|i^ICpI&t~twvy0bG-llg?&(iI6e(d>T z`EJAWW%srlE&Kn~S@`>O$=w@vu6dPvb#a>cVIj^FgoYF-BbJApQN literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/73/cf03db6ece34e12bf91e8853dc58f678f2f82d b/tests/gitea-repositories-meta/user2/lfs.git/objects/73/cf03db6ece34e12bf91e8853dc58f678f2f82d new file mode 100644 index 0000000000..5eee31d8aa --- /dev/null +++ b/tests/gitea-repositories-meta/user2/lfs.git/objects/73/cf03db6ece34e12bf91e8853dc58f678f2f82d @@ -0,0 +1,2 @@ +xQ +B!EvbƗAD70V¹'RrMY0Y";28:/AĜ&Z_6]g\dk9%ihXG?O]g@}97 \ No newline at end of file diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/74/21a018a7e3f15ee5691f162d0ed87dc19882f0 b/tests/gitea-repositories-meta/user2/lfs.git/objects/74/21a018a7e3f15ee5691f162d0ed87dc19882f0 new file mode 100644 index 0000000000000000000000000000000000000000..cbbde812d7aa0c8a42c6d0f2a0fe19abb9282a48 GIT binary patch literal 123 zcmb{2TL1t6 literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/82/76d2a29779af982c0afa976bdb793b52d442a8 b/tests/gitea-repositories-meta/user2/lfs.git/objects/82/76d2a29779af982c0afa976bdb793b52d442a8 new file mode 100644 index 0000000000000000000000000000000000000000..cbee9fb5a0aba392bab4eb4459fb5255e7f883ac GIT binary patch literal 38 ucmb7IDb#L&E-<1+v?g%BeE literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/bc/e50ea8f203ee923d5a640d05208abf3206486e b/tests/gitea-repositories-meta/user2/lfs.git/objects/bc/e50ea8f203ee923d5a640d05208abf3206486e new file mode 100644 index 0000000000000000000000000000000000000000..83e8159975cb9efbb8f2dcc2e219cd6d1f23e5d7 GIT binary patch literal 92 zcmb)FVqjumU~Cw8!TY?9r;euPDIYCePu;W~b$yOM?mW%gmRVkEyzXq* zTfeLNUm8~N6qS~IEWLW#H!(o0V$*`UO(zab{q_C(yscL=ekz#fnle~jRJaTP0nRIO literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/d4/a41a0d4db4949e129bd22f871171ea988103ef b/tests/gitea-repositories-meta/user2/lfs.git/objects/d4/a41a0d4db4949e129bd22f871171ea988103ef new file mode 100644 index 0000000000000000000000000000000000000000..01f6e7bc630fa24e36852cac598a7b341456b6d3 GIT binary patch literal 123 zcmbMj2!m7Xhp z<7Inmk9?}m|JUleSLSEUnRzAEC11zA_rY~pBSH0a^A9{16_q!YA24jXb}(48&CtLo fqP_62K+#E$TkBSHnoW>+J6knld#AjBisljk$%8e5 literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/d7/ce0013ced38b0696dd2d68d69a5d8b652f7148 b/tests/gitea-repositories-meta/user2/lfs.git/objects/d7/ce0013ced38b0696dd2d68d69a5d8b652f7148 new file mode 100644 index 0000000000000000000000000000000000000000..53d1fe21e9a5ad6b91434c6a18b7749dc2e1294a GIT binary patch literal 55 zcmbTWvgsU7BV(#M$Qt&~YyOXYT M3F$H1^AO?y0G3!67ytkO literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/lfs.git/objects/df/d8105b264d304c49ed9f1d56bd90189ecdf833 b/tests/gitea-repositories-meta/user2/lfs.git/objects/df/d8105b264d304c49ed9f1d56bd90189ecdf833 new file mode 100644 index 0000000000000000000000000000000000000000..11940b8f795fe8dd75046c644ca8dce1db2e64a0 GIT binary patch literal 75 zcmb3ieY}~Ci-Nl^ h1s~M8JLyW7ke=?|HBBW-p=znm1eXdi+|)E&2LSVmAgurZ literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/lfs.git/refs/heads/master b/tests/gitea-repositories-meta/user2/lfs.git/refs/heads/master new file mode 100644 index 0000000000..8832a3e857 --- /dev/null +++ b/tests/gitea-repositories-meta/user2/lfs.git/refs/heads/master @@ -0,0 +1 @@ +73cf03db6ece34e12bf91e8853dc58f678f2f82d diff --git a/tests/integration/lfs_view_test.go b/tests/integration/lfs_view_test.go new file mode 100644 index 0000000000..1775fa629f --- /dev/null +++ b/tests/integration/lfs_view_test.go @@ -0,0 +1,83 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "net/http" + "testing" + + "code.gitea.io/gitea/tests" + + "github.com/stretchr/testify/assert" +) + +// check that files stored in LFS render properly in the web UI +func TestLFSRender(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + session := loginUser(t, "user2") + + // check that a markup file is flagged with "Stored in Git LFS" and shows its text + t.Run("Markup", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", "/user2/lfs/src/branch/master/CONTRIBUTING.md") + resp := session.MakeRequest(t, req, http.StatusOK) + + doc := NewHTMLParser(t, resp.Body).doc + + fileInfo := doc.Find("div.file-info-entry").First().Text() + assert.Contains(t, fileInfo, "Stored with Git LFS") + + content := doc.Find("div.file-view").Text() + assert.Contains(t, content, "Testing documents in LFS") + }) + + // check that an image is flagged with "Stored in Git LFS" and renders inline + t.Run("Image", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", "/user2/lfs/src/branch/master/jpeg.jpg") + resp := session.MakeRequest(t, req, http.StatusOK) + + doc := NewHTMLParser(t, resp.Body).doc + + fileInfo := doc.Find("div.file-info-entry").First().Text() + assert.Contains(t, fileInfo, "Stored with Git LFS") + + src, exists := doc.Find(".file-view img").Attr("src") + assert.True(t, exists, "The image should be in an tag") + assert.Equal(t, "/user2/lfs/media/branch/master/jpeg.jpg", src, "The image should use the /media link because it's in LFS") + }) + + // check that a binary file is flagged with "Stored in Git LFS" and renders a /media/ link instead of a /raw/ link + t.Run("Binary", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", "/user2/lfs/src/branch/master/crypt.bin") + resp := session.MakeRequest(t, req, http.StatusOK) + + doc := NewHTMLParser(t, resp.Body).doc + + fileInfo := doc.Find("div.file-info-entry").First().Text() + assert.Contains(t, fileInfo, "Stored with Git LFS") + + rawLink, exists := doc.Find("div.file-view > div.view-raw > a").Attr("href") + assert.True(t, exists, "Download link should render instead of content because this is a binary file") + assert.Equal(t, "/user2/lfs/media/branch/master/crypt.bin", rawLink, "The download link should use the proper /media link because it's in LFS") + }) + + // check that a directory with a README file shows its text + t.Run("Readme", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", "/user2/lfs/src/branch/master/subdir") + resp := session.MakeRequest(t, req, http.StatusOK) + + doc := NewHTMLParser(t, resp.Body).doc + + content := doc.Find("div.file-view").Text() + assert.Contains(t, content, "Testing READMEs in LFS") + }) +} diff --git a/tests/test_utils.go b/tests/test_utils.go index b4bd4a011e..721edc86f8 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -167,7 +167,11 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() { ourSkip += skip[0] } deferFn := PrintCurrentTest(t, ourSkip) + + // load database fixtures assert.NoError(t, unittest.LoadFixtures()) + + // load git repo fixtures assert.NoError(t, util.RemoveAll(setting.RepoRootPath)) assert.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath)) ownerDirs, err := os.ReadDir(setting.RepoRootPath) @@ -190,6 +194,16 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() { } } + // load LFS object fixtures + // (LFS storage can be on any of several backends, including remote servers, so we init it with the storage API) + lfsFixtures, err := storage.NewStorage("", storage.LocalStorageConfig{Path: path.Join(filepath.Dir(setting.AppPath), "tests/gitea-lfs-meta")}) + assert.NoError(t, err) + assert.NoError(t, storage.Clean(storage.LFS)) + assert.NoError(t, lfsFixtures.IterateObjects(func(path string, _ storage.Object) error { + _, err := storage.Copy(storage.LFS, path, lfsFixtures, path) + return err + })) + return deferFn } @@ -198,7 +212,11 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() { // within a single test this is required func ResetFixtures(t *testing.T) { assert.NoError(t, queue.GetManager().FlushAll(context.Background(), -1)) + + // load database fixtures assert.NoError(t, unittest.LoadFixtures()) + + // load git repo fixtures assert.NoError(t, util.RemoveAll(setting.RepoRootPath)) assert.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath)) ownerDirs, err := os.ReadDir(setting.RepoRootPath) @@ -220,4 +238,14 @@ func ResetFixtures(t *testing.T) { _ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "tag"), 0o755) } } + + // load LFS object fixtures + // (LFS storage can be on any of several backends, including remote servers, so we init it with the storage API) + lfsFixtures, err := storage.NewStorage("", storage.LocalStorageConfig{Path: path.Join(filepath.Dir(setting.AppPath), "tests/gitea-lfs-meta")}) + assert.NoError(t, err) + assert.NoError(t, storage.Clean(storage.LFS)) + assert.NoError(t, lfsFixtures.IterateObjects(func(path string, _ storage.Object) error { + _, err := storage.Copy(storage.LFS, path, lfsFixtures, path) + return err + })) }