mirror of
https://github.com/bpatrik/pigallery2.git
synced 2024-12-23 01:27:14 +02:00
resolve merge conflicts due to PR #829
This commit is contained in:
parent
0f0a66c05d
commit
fb65910993
@ -3,7 +3,7 @@
|
||||
"width": 10,
|
||||
"height": 5
|
||||
},
|
||||
"creationDate": 1709057753000,
|
||||
"creationDate": 1709549328178,
|
||||
"fileSize": 4489,
|
||||
"keywords": [
|
||||
"floor",
|
||||
|
@ -3,10 +3,10 @@
|
||||
"width": 10,
|
||||
"height": 5
|
||||
},
|
||||
"creationDate": 1709057753000,
|
||||
"creationDate": 1709549328185,
|
||||
"fileSize": 1430,
|
||||
"keywords": [
|
||||
"first",
|
||||
"second"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
12
test/backend/assets/sidecar/no_metadata_v2.jpg.json
Normal file
12
test/backend/assets/sidecar/no_metadata_v2.jpg.json
Normal file
@ -0,0 +1,12 @@
|
||||
{
|
||||
"size": {
|
||||
"width": 10,
|
||||
"height": 5
|
||||
},
|
||||
"creationDate": 1709549328188,
|
||||
"fileSize": 1430,
|
||||
"keywords": [
|
||||
"first",
|
||||
"second"
|
||||
]
|
||||
}
|
@ -3,9 +3,9 @@
|
||||
"width": 10,
|
||||
"height": 5
|
||||
},
|
||||
"creationDate": 1709057753000,
|
||||
"creationDate": 1709549328189,
|
||||
"fileSize": 1430,
|
||||
"keywords": [
|
||||
"first"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@ -131,7 +131,7 @@ describe('MetadataLoader', () => {
|
||||
|
||||
it('should load sidecar file without file extension for photo', async () => {
|
||||
const data = await MetadataLoader.loadPhotoMetadata(path.join(__dirname, '/../../../assets/sidecar/no_metadata_v2.jpg'));
|
||||
const expected = require(path.join(__dirname, '/../../../assets/sidecar/no_metadata.jpg.json'));//sidecar "no_metadata_v2.xmp" is identical to "no_metadata.jpg.xmp" so we expect the same result
|
||||
const expected = require(path.join(__dirname, '/../../../assets/sidecar/no_metadata_v2.jpg.json'));
|
||||
expect(Utils.clone(data)).to.be.deep.equal(expected);
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user