Mirrors/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2026-01-23 02:24:24 +00:00
Code Issues Projects Releases Wiki Activity

Tests: Set MediaType in internal/entity/file_fixtures.go #47 #4560

Browse source 
No media type was specified for some file test fixtures, which caused
tests to fail when upgrading the GORM ORM library from v1 to v2.

Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2024-10-21 09:59:59 +02:00
parent b5ee57d13f
commit e561b222c5
3 changed files with 73 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -68,6 +68,7 @@ test: test-js test-go
test-go: reset-sqlite run-test-go
test-pkg: reset-sqlite run-test-pkg
test-api: reset-sqlite run-test-api
test-entity: reset-sqlite run-test-entity
test-commands: reset-sqlite run-test-commands
test-photoprism: reset-sqlite run-test-photoprism
test-short: reset-sqlite run-test-short
@ -351,6 +352,9 @@ run-test-pkg:
run-test-api:
$(info Running all API tests...)
$(GOTEST) -parallel 2 -count 1 -cpu 2 -tags slow -timeout 20m ./internal/api/...
run-test-entity:
$(info Running all Entity tests...)
$(GOTEST) -parallel 2 -count 1 -cpu 2 -tags slow -timeout 20m ./internal/entity/...
run-test-commands:
$(info Running all CLI command tests...)
$(GOTEST) -parallel 2 -count 1 -cpu 2 -tags slow -timeout 20m ./internal/commands/...

95
internal/entity/file_fixtures.go
View file

@ -40,6 +40,7 @@ var FileFixtures = FileMap{
FileSize: 4278906,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -84,7 +85,7 @@ var FileFixtures = FileMap{
FileSize: 661858,
FileCodec: "jpeg",
FileType: "raw",
MediaType: string(media.Raw),
MediaType: media.Raw.String(),
FileMime: "image/DNG",
FilePrimary: false,
FileSidecar: false,
@ -126,7 +127,7 @@ var FileFixtures = FileMap{
FileSize: 858,
FileCodec: "",
FileType: "xmp",
MediaType: string(media.Sidecar),
MediaType: media.Sidecar.String(),
FileMime: "",
FilePrimary: false,
FileSidecar: true,
@ -168,7 +169,7 @@ var FileFixtures = FileMap{
FileSize: 961858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -210,7 +211,7 @@ var FileFixtures = FileMap{
FileSize: 81858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -252,7 +253,7 @@ var FileFixtures = FileMap{
FileSize: 500,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -294,7 +295,7 @@ var FileFixtures = FileMap{
FileSize: 500,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -336,7 +337,7 @@ var FileFixtures = FileMap{
FileSize: 500,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -378,7 +379,7 @@ var FileFixtures = FileMap{
FileSize: 7799202,
FileCodec: "avc1",
FileType: "mp4",
MediaType: string(media.Video),
MediaType: media.Video.String(),
FileMime: "video/mp4",
FilePrimary: false,
FileSidecar: false,
@ -420,7 +421,7 @@ var FileFixtures = FileMap{
FileSize: 7799202,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -462,7 +463,7 @@ var FileFixtures = FileMap{
FileSize: 500,
FileCodec: "avc1",
FileType: "mp4",
MediaType: string(media.Video),
MediaType: media.Video.String(),
FileMime: "video/mp4",
FilePrimary: false,
FileSidecar: false,
@ -504,7 +505,7 @@ var FileFixtures = FileMap{
FileSize: 961851,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -546,7 +547,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -588,7 +589,7 @@ var FileFixtures = FileMap{
FileSize: 921851,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: false,
FileSidecar: false,
@ -630,7 +631,7 @@ var FileFixtures = FileMap{
FileSize: 921851,
FileCodec: "avc1",
FileType: "mp4",
MediaType: string(media.Video),
MediaType: media.Video.String(),
FileMime: "image/mp4",
FilePrimary: false,
FileSidecar: false,
@ -672,7 +673,7 @@ var FileFixtures = FileMap{
FileSize: 921831,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -714,7 +715,7 @@ var FileFixtures = FileMap{
FileSize: 921831,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -756,7 +757,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -798,7 +799,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -840,7 +841,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "avc1",
FileType: "mp4",
MediaType: string(media.Video),
MediaType: media.Video.String(),
FileMime: "video/mp4",
FilePrimary: false,
FileSidecar: false,
@ -882,7 +883,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -924,7 +925,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "jpeg",
FileType: "raw",
MediaType: string(media.Raw),
MediaType: media.Raw.String(),
FileMime: "image/x-canon-cr2",
FilePrimary: false,
FileSidecar: false,
@ -966,7 +967,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -1008,6 +1009,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -1049,6 +1051,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: false,
FileSidecar: false,
@ -1090,6 +1093,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -1131,6 +1135,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "avc1",
FileType: "mp4",
MediaType: media.Video.String(),
FileMime: "video/mp4",
FilePrimary: false,
FileSidecar: false,
@ -1170,6 +1175,7 @@ var FileFixtures = FileMap{
FileSize: 900,
FileCodec: "avc1",
FileType: "mp4",
MediaType: media.Video.String(),
FileMime: "video/mp4",
FilePrimary: false,
FileSidecar: false,
@ -1211,6 +1217,7 @@ var FileFixtures = FileMap{
FileSize: 7799202,
FileCodec: "deflate/inflate",
FileType: "png",
MediaType: media.Image.String(),
FileMime: "image/png",
FilePrimary: false,
FileSidecar: false,
@ -1252,6 +1259,7 @@ var FileFixtures = FileMap{
FileSize: 199202,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1292,8 +1300,9 @@ var FileFixtures = FileMap{
FileHash: "pcad9a68fa6acc5c5ba965adf6ec465ca42fd918",
FileSize: 199202,
FileCodec: "heic",
FileType: "heif",
FileMime: "image/heif",
FileType: "heic",
MediaType: media.Image.String(),
FileMime: "image/heic",
FilePrimary: false,
FileSidecar: false,
FileVideo: false,
@ -1334,6 +1343,7 @@ var FileFixtures = FileMap{
FileSize: 199202,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1375,6 +1385,7 @@ var FileFixtures = FileMap{
FileSize: 199202,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1416,6 +1427,7 @@ var FileFixtures = FileMap{
FileSize: 199202,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1457,6 +1469,7 @@ var FileFixtures = FileMap{
FileSize: 199202,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: false,
FileSidecar: false,
@ -1498,6 +1511,7 @@ var FileFixtures = FileMap{
FileSize: 199202,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1539,6 +1553,7 @@ var FileFixtures = FileMap{
FileSize: 199202,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1580,6 +1595,7 @@ var FileFixtures = FileMap{
FileSize: 199202,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1621,6 +1637,7 @@ var FileFixtures = FileMap{
FileSize: 8202,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1662,6 +1679,7 @@ var FileFixtures = FileMap{
FileSize: 8402,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1703,6 +1721,7 @@ var FileFixtures = FileMap{
FileSize: 6402,
FileCodec: "",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpeg",
FilePrimary: true,
FileSidecar: false,
@ -1744,6 +1763,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -1785,6 +1805,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -1826,6 +1847,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -1867,6 +1889,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -1908,6 +1931,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -1949,6 +1973,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -1990,6 +2015,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2031,6 +2057,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2072,6 +2099,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2113,6 +2141,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2154,6 +2183,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2195,6 +2225,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2236,6 +2267,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2277,6 +2309,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2318,6 +2351,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2359,6 +2393,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2400,6 +2435,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2441,6 +2477,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2482,6 +2519,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2523,6 +2561,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2564,7 +2603,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: string(fs.ImageJPEG),
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2606,7 +2645,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2648,7 +2687,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: string(media.Image),
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2690,6 +2729,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,
@ -2731,6 +2771,7 @@ var FileFixtures = FileMap{
FileSize: 921858,
FileCodec: "jpeg",
FileType: "jpg",
MediaType: media.Image.String(),
FileMime: "image/jpg",
FilePrimary: true,
FileSidecar: false,

2
internal/entity/query/file_selection_test.go
View file

@ -57,7 +57,7 @@ func TestFileSelection(t *testing.T) {
if results, err := SelectedFiles(many, sel); err != nil {
t.Fatal(err)
} else {
assert.Len(t, results, 3)
assert.Len(t, results, 4)
}
})
t.Run("ShareSelectionPrimary", func(t *testing.T) {