resolve merge conflicts due to PR #829

test/backend/assets/sidecar/metadata.jpg.json

@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709057753000,
+  "creationDate": 1709549328178,
   "fileSize": 4489,
   "keywords": [
     "floor",

test/backend/assets/sidecar/no_metadata.jpg.json

@@ -3,10 +3,10 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709057753000,
+  "creationDate": 1709549328185,
   "fileSize": 1430,
   "keywords": [
     "first",
     "second"
   ]
-}
+}

test/backend/assets/sidecar/no_metadata_v2.jpg.json

@@ -0,0 +1,12 @@
+{
+  "size": {
+    "width": 10,
+    "height": 5
+  },
+  "creationDate": 1709549328188,
+  "fileSize": 1430,
+  "keywords": [
+    "first",
+    "second"
+  ]
+}

test/backend/assets/sidecar/no_metadata_v3.jpg.json

@@ -3,9 +3,9 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709057753000,
+  "creationDate": 1709549328189,
   "fileSize": 1430,
   "keywords": [
     "first"
   ]
-}
+}

test/backend/unit/model/threading/MetaDataLoader.spec.ts

@@ -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);
   });