DO NOT MERGE

cozy-labs · Aug 1, 2024 · 8489018 · 8489018
1 parent 296c175
commit 8489018
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -91,9 +91,9 @@ jobs:
       - name: Elm tests
         run: yarn test:elm
       - name: World tests
-        run: yarn test:world --forbid-only
+        run: yarn test:world
       - name: Unit tests
-        run: yarn test:unit --forbid-only
+        run: yarn test:unit
 
   integration:
     needs: cancel
@@ -145,7 +145,7 @@ jobs:
       - name: Start Xvfb
         run: sudo Xvfb :99 -ac -screen 0 1024x768x8 &
       - name: Integration tests
-        run: yarn test:integration --forbid-only
+        run: yarn test:integration
 
   scenarios:
     needs: cancel
@@ -203,7 +203,7 @@ jobs:
       - name: Scenarios
         env:
             STOPPED_CLIENT: ${{ matrix.stopped_client == 'STOPPED' }}
-        run: yarn test:scenarios --forbid-only
+        run: yarn test:scenarios
 
   build:
     needs: cancel

diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
@@ -124,7 +124,7 @@ jobs:
       - name: Unit tests
         env:
           COZY_DESKTOP_FS: ${{ matrix.fs }}
-        run: yarn test:unit --forbid-only
+        run: yarn test:unit
 
   integration:
     needs: [cancel, docker_cache_key]
@@ -193,7 +193,7 @@ jobs:
       - name: Integration tests
         env:
           COZY_DESKTOP_FS: ${{ matrix.fs }}
-        run: yarn test:integration --forbid-only
+        run: yarn test:integration
 
   scenarios:
     needs: [cancel, docker_cache_key]
@@ -270,7 +270,7 @@ jobs:
         env:
           STOPPED_CLIENT: ${{ matrix.stopped_client == 'STOPPED' }}
           COZY_DESKTOP_FS: ${{ matrix.fs }}
-        run: yarn test:scenarios --forbid-only
+        run: yarn test:scenarios
 
   build:
     needs: cancel

diff --git a/core/merge.js b/core/merge.js
@@ -145,6 +145,8 @@ class Merge {
             file.local.updated_at === doc.local.updated_at)
         ) {
           log.debug({ path: doc.path, doc, file }, 'Same local metadata')
+          // eslint-disable-next-line no-console
+          console.log('updateFileAsync 1', { side, doc, file })
           return
         }
       }
@@ -231,6 +233,8 @@ class Merge {
           }
           return this.save(doc)
         } else {
+          // eslint-disable-next-line no-console
+          console.log('updateFileAsync 2', { side, doc, file })
           return
         }
       }
@@ -269,6 +273,8 @@ class Merge {
           } else {
             // TODO: should we save the new metadata anyway to make sure we
             // have up-to-date side infos?
+            // eslint-disable-next-line no-console
+            console.log('updateFileAsync 3', { side, doc, file })
             return
           }
         } else {
@@ -307,6 +313,8 @@ class Merge {
           } else {
             // TODO: should we save the new metadata anyway to make sure we
             // have up-to-date side infos?
+            // eslint-disable-next-line no-console
+            console.log('updateFileAsync 4', { side, doc, file })
             return
           }
         }

diff --git a/test/unit/merge.js b/test/unit/merge.js
@@ -2518,7 +2518,7 @@ describe('Merge', function () {
         })
       })
 
-      it('converts an overwriting move into a local update', async function () {
+      it.only('converts an overwriting move into a local update', async function () {
         const existing = await builders
           .metafile()
           .path('FOO/NEW')