Skip to content

Commit

Permalink
re-enable unit test that keywords from photo are merged with keywords…
Browse files Browse the repository at this point in the history
… from sidecar
  • Loading branch information
kagahd committed Mar 12, 2024
1 parent f356eae commit d8c0648
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
Binary file removed test/backend/assets/sidecar/metadata.jpg_original
Binary file not shown.
Binary file modified test/backend/assets/sidecar/metadata_v2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions test/backend/assets/sidecar/metadata_v2.jpg.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"width": 10,
"height": 5
},
"creationDate": 1709057753000,
"fileSize": 4489,
"creationDate": 1710188754000,
"fileSize": 5095,
"keywords": [
"floor",
"book",
Expand Down
3 changes: 2 additions & 1 deletion test/backend/unit/model/threading/MetaDataLoader.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ describe('MetadataLoader', () => {

it('should merge keywords from photo with keywords from sidecar', async () => {
const data = await MetadataLoader.loadPhotoMetadata(path.join(__dirname, '/../../../assets/sidecar/metadata_v2.jpg'));
const expected = require(path.join(__dirname, '/../../../assets/sidecar/metadata_v2.jpg.json')); //"metadata_v2.jpg" is identical to "metadata.jpg" and "metadata_v2.xmp" contains 2 different keywords expect(Utils.clone(data)).to.be.deep.equal(expected);
const expected = require(path.join(__dirname, '/../../../assets/sidecar/metadata_v2.jpg.json')); //"metadata_v2.jpg" is identical to "metadata.jpg" and "metadata_v2.xmp" contains 2 different keywords
expect(Utils.clone(data)).to.be.deep.equal(expected);
});


Expand Down

0 comments on commit d8c0648

Please sign in to comment.