fix: fix file move debug

forcedotcom · May 13, 2024 · e7d0591 · e7d0591
1 parent f986a1b
commit e7d0591
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/shared/localShadowRepo.ts b/src/shared/localShadowRepo.ts
@@ -410,10 +410,12 @@ export class ShadowRepo {
     }
 
     this.logger.debug(
-      ['Files have moved. Committing moved files:', ...matches.entries()]
-        .map(([add, del]) => `File ${add} was moved to ${del}`)
-        .join('\n')
+      [
+        'Files have moved. Committing moved files:',
+        [...matches.entries()].map(([del, add]) => `- File ${add} was moved to ${del}`).join(os.EOL),
+      ].join(os.EOL)
     );
+
     movedFilesMarker?.addDetails({ filesMoved: matches.size });
 
     // Commit the moved files and refresh the status

diff --git a/test/unit/localDetectMovedFiles.test.ts b/test/unit/localDetectMovedFiles.test.ts
@@ -29,6 +29,7 @@ describe('local detect moved files', () => {
       projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'localShadowRepoTest'));
       fs.mkdirSync(path.join(projectDir, 'force-app', 'new'), { recursive: true });
       fs.writeFileSync(path.join(projectDir, 'force-app', 'CustomLabels.labels-meta.xml'), '<xml></xml>');
+      fs.writeFileSync(path.join(projectDir, 'force-app', 'CustomLabelsTwo.labels-meta.xml'), '<xml></xml>');
 
       const shadowRepo: ShadowRepo = await ShadowRepo.getInstance({
         orgId: '00D456789012345',
@@ -47,7 +48,8 @@ describe('local detect moved files', () => {
 
       // Manually commit this first file
       const labelsFile = path.join('force-app', 'CustomLabels.labels-meta.xml');
-      const sha = await shadowRepo.commitChanges({ deployedFiles: [labelsFile] });
+      const labelsFileTwo = path.join('force-app', 'CustomLabelsTwo.labels-meta.xml');
+      const sha = await shadowRepo.commitChanges({ deployedFiles: [labelsFile, labelsFileTwo] });
       expect(sha).to.not.be.empty;
       expect(gitAdd.calledOnce).to.be.true;
 
@@ -56,6 +58,11 @@ describe('local detect moved files', () => {
         path.join(projectDir, labelsFile),
         path.join(projectDir, 'force-app', 'new', 'CustomLabels.labels-meta.xml')
       );
+
+      fs.renameSync(
+        path.join(projectDir, labelsFileTwo),
+        path.join(projectDir, 'force-app', 'new', 'CustomLabelsTwo.labels-meta.xml')
+      );
       await shadowRepo.getStatus(true);
 
       // Moved file should have been detected and committed