Hoist file path consts to describe block scope in ChangeFiles.test.ts.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: iclanton

libraries/rush-lib/src/logic/test/ChangeFiles.test.ts

@@ -39,43 +39,50 @@ describe(ChangeFiles.name, () => {
   });
 
   describe(ChangeFiles.prototype.getAllChangeFilesAsync.name, () => {
+    const leafChangeDir: string = `${__dirname}/leafChange`;
+    const noChangeDir: string = `${__dirname}/noChange`;
+    const categorizedChangesDir: string = `${__dirname}/categorizedChanges`;
+
     it('returns correctly when there is one change file', async () => {
-      const changesPath: string = `${__dirname}/leafChange`;
       const changeFiles: ChangeFiles = new ChangeFiles({
-        changesFolder: changesPath
+        changesFolder: leafChangeDir
       } as unknown as RushConfiguration);
-      const expectedPath: string = Path.convertToSlashes(`${changesPath}/change1.json`);
+      const expectedPath: string = Path.convertToSlashes(`${leafChangeDir}/change1.json`);
       await expect(changeFiles.getAllChangeFilesAsync()).resolves.toEqual([expectedPath]);
     });
 
     it('returns empty array when no change files', async () => {
-      const changesPath: string = `${__dirname}/noChange`;
       const changeFiles: ChangeFiles = new ChangeFiles({
-        changesFolder: changesPath
+        changesFolder: noChangeDir
       } as unknown as RushConfiguration);
       await expect(changeFiles.getAllChangeFilesAsync()).resolves.toHaveLength(0);
     });
 
     it('returns correctly when change files are categorized', async () => {
-      const changesPath: string = `${__dirname}/categorizedChanges`;
       const changeFiles: ChangeFiles = new ChangeFiles({
-        changesFolder: changesPath
+        changesFolder: categorizedChangesDir
       } as unknown as RushConfiguration);
       const files: string[] = await changeFiles.getAllChangeFilesAsync();
       expect(files).toHaveLength(3);
 
-      const expectedPathA: string = Path.convertToSlashes(`${changesPath}/@ms/a/changeA.json`);
-      const expectedPathB: string = Path.convertToSlashes(`${changesPath}/@ms/b/changeB.json`);
-      const expectedPathC: string = Path.convertToSlashes(`${changesPath}/changeC.json`);
+      const expectedPathA: string = Path.convertToSlashes(`${categorizedChangesDir}/@ms/a/changeA.json`);
+      const expectedPathB: string = Path.convertToSlashes(`${categorizedChangesDir}/@ms/b/changeB.json`);
+      const expectedPathC: string = Path.convertToSlashes(`${categorizedChangesDir}/changeC.json`);
       expect(files).toContain(expectedPathA);
       expect(files).toContain(expectedPathB);
       expect(files).toContain(expectedPathC);
     });
   });
 
   describe(ChangeFiles.prototype.validateAsync.name, () => {
+    const leafChangeFile: string = `${__dirname}/leafChange/change1.json`;
+    const hotfixChangeFile: string = `${__dirname}/multipleHotfixChanges/change1.json`;
+    const verifyChangesFile: string = `${__dirname}/verifyChanges/changes.json`;
+    const categorizedChangeFileA: string = `${__dirname}/categorizedChanges/@ms/a/changeA.json`;
+    const categorizedChangeFileB: string = `${__dirname}/categorizedChanges/@ms/b/changeB.json`;
+    const categorizedChangeFileC: string = `${__dirname}/categorizedChanges/changeC.json`;
+
     it('throws when there is a patch in a hotfix branch.', async () => {
-      const changeFile: string = `${__dirname}/leafChange/change1.json`;
       const changedPackages: string[] = ['d'];
       await expect(
         new ChangeFiles({
@@ -85,73 +92,69 @@ describe(ChangeFiles.name, () => {
           }
         } as unknown as RushConfiguration).validateAsync({
           terminal,
-          filesToValidate: [changeFile],
+          filesToValidate: [leafChangeFile],
           changedProjectNames: changedPackages
         })
       ).rejects.toThrow(Error);
     });
 
     it('allows a hotfix in a hotfix branch.', async () => {
-      const changeFile: string = `${__dirname}/multipleHotfixChanges/change1.json`;
       const changedPackages: string[] = ['a'];
       await new ChangeFiles({
         ...rushConfiguration,
         hotfixChangeEnabled: true
       } as unknown as RushConfiguration).validateAsync({
         terminal,
-        filesToValidate: [changeFile],
+        filesToValidate: [hotfixChangeFile],
         changedProjectNames: changedPackages
       });
     });
 
     it('throws when there is any missing package.', async () => {
-      const changeFile: string = `${__dirname}/verifyChanges/changes.json`;
       const changedPackages: string[] = ['a', 'b', 'c'];
       await expect(
         new ChangeFiles(rushConfiguration).validateAsync({
           terminal,
-          filesToValidate: [changeFile],
+          filesToValidate: [verifyChangesFile],
           changedProjectNames: changedPackages
         })
       ).rejects.toThrow(Error);
     });
 
     it('does not throw when there is no missing packages', async () => {
-      const changeFile: string = `${__dirname}/verifyChanges/changes.json`;
       const changedPackages: string[] = ['a'];
       await new ChangeFiles(rushConfiguration).validateAsync({
         terminal,
-        filesToValidate: [changeFile],
+        filesToValidate: [verifyChangesFile],
         changedProjectNames: changedPackages
       });
     });
 
     it('throws when missing packages from categorized changes', async () => {
-      const changeFileA: string = `${__dirname}/categorizedChanges/@ms/a/changeA.json`;
-      const changeFileB: string = `${__dirname}/categorizedChanges/@ms/b/changeB.json`;
       const changedPackages: string[] = ['@ms/a', '@ms/b', 'c'];
       await expect(
         new ChangeFiles(rushConfiguration).validateAsync({
           terminal,
-          filesToValidate: [changeFileA, changeFileB],
+          filesToValidate: [categorizedChangeFileA, categorizedChangeFileB],
           changedProjectNames: changedPackages
         })
       ).rejects.toThrow(Error);
     });
 
     it('does not throw when no missing packages from categorized changes', async () => {
-      const changeFileA: string = `${__dirname}/categorizedChanges/@ms/a/changeA.json`;
-      const changeFileB: string = `${__dirname}/categorizedChanges/@ms/b/changeB.json`;
-      const changeFileC: string = `${__dirname}/categorizedChanges/changeC.json`;
       const changedPackages: string[] = ['@ms/a', '@ms/b', 'c'];
       await new ChangeFiles(rushConfiguration).validateAsync({
         terminal,
-        filesToValidate: [changeFileA, changeFileB, changeFileC],
+        filesToValidate: [categorizedChangeFileA, categorizedChangeFileB, categorizedChangeFileC],
         changedProjectNames: changedPackages
       });
     });
 
     describe('with strictChangefileValidation', () => {
+      const nonexistentProjectChangeFile: string = `${__dirname}/strictValidation/nonexistentProject.json`;
+      const nonMainLockstepChangeFile: string = `${__dirname}/strictValidation/nonMainLockstep.json`;
+      const mainLockstepChangeFile: string = `${__dirname}/strictValidation/mainLockstep.json`;
+
       let strictConfig: RushConfiguration;
 
       function createStrictConfig(
@@ -166,12 +169,11 @@ describe(ChangeFiles.name, () => {
       }
 
       it('throws when change file references a nonexistent project', async () => {
-        const changeFile: string = `${__dirname}/strictValidation/nonexistentProject.json`;
         strictConfig = createStrictConfig(() => undefined);
         try {
           await new ChangeFiles(strictConfig).validateAsync({
             terminal,
-            filesToValidate: [changeFile],
+            filesToValidate: [nonexistentProjectChangeFile],
             changedProjectNames: ['nonexistent-package']
           });
           fail('Expected validateAsync to throw');
@@ -185,7 +187,6 @@ describe(ChangeFiles.name, () => {
       });
 
       it('throws when change file references a non-main lockstep project', async () => {
-        const changeFile: string = `${__dirname}/strictValidation/nonMainLockstep.json`;
         strictConfig = createStrictConfig((name: string) => {
           if (name === 'lockstep-secondary') {
             return {
@@ -202,7 +203,7 @@ describe(ChangeFiles.name, () => {
         try {
           await new ChangeFiles(strictConfig).validateAsync({
             terminal,
-            filesToValidate: [changeFile],
+            filesToValidate: [nonMainLockstepChangeFile],
             changedProjectNames: ['lockstep-secondary']
           });
           fail('Expected validateAsync to throw');
@@ -216,7 +217,6 @@ describe(ChangeFiles.name, () => {
       });
 
       it('does not throw when change file references the main lockstep project', async () => {
-        const changeFile: string = `${__dirname}/strictValidation/mainLockstep.json`;
         strictConfig = createStrictConfig((name: string) => {
           if (name === 'lockstep-main') {
             return {
@@ -232,13 +232,12 @@ describe(ChangeFiles.name, () => {
         });
         await new ChangeFiles(strictConfig).validateAsync({
           terminal,
-          filesToValidate: [changeFile],
+          filesToValidate: [mainLockstepChangeFile],
           changedProjectNames: ['lockstep-main']
         });
       });
 
       it('does not throw when change file references a lockstep project with no mainProject', async () => {
-        const changeFile: string = `${__dirname}/strictValidation/mainLockstep.json`;
         strictConfig = createStrictConfig((name: string) => {
           if (name === 'lockstep-main') {
             return {
@@ -254,40 +253,40 @@ describe(ChangeFiles.name, () => {
         });
         await new ChangeFiles(strictConfig).validateAsync({
           terminal,
-          filesToValidate: [changeFile],
+          filesToValidate: [mainLockstepChangeFile],
           changedProjectNames: ['lockstep-main']
         });
       });
 
       it('does not throw when experiment is disabled', async () => {
-        const changeFile: string = `${__dirname}/strictValidation/nonexistentProject.json`;
         const config: RushConfiguration = {
           experimentsConfiguration: {
             configuration: { strictChangefileValidation: false }
           } as ExperimentsConfiguration
         } as unknown as RushConfiguration;
         await new ChangeFiles(config).validateAsync({
           terminal,
-          filesToValidate: [changeFile],
+          filesToValidate: [nonexistentProjectChangeFile],
           changedProjectNames: ['nonexistent-package']
         });
       });
     });
   });
 
   describe(ChangeFiles.prototype.deleteAllAsync.name, () => {
+    const multipleChangeFilesDir: string = `${__dirname}/multipleChangeFiles`;
+    const multipleHotfixChangesDir: string = `${__dirname}/multipleHotfixChanges`;
+
     it('delete all files when there are no prerelease packages', async () => {
-      const changesPath: string = `${__dirname}/multipleChangeFiles`;
       const changeFiles: ChangeFiles = new ChangeFiles({
-        changesFolder: changesPath
+        changesFolder: multipleChangeFilesDir
       } as unknown as RushConfiguration);
       await expect(changeFiles.deleteAllAsync(terminal, false)).resolves.toEqual(3);
     });
 
     it('does not delete change files for package whose change logs do not get updated. ', async () => {
-      const changesPath: string = `${__dirname}/multipleChangeFiles`;
       const changeFiles: ChangeFiles = new ChangeFiles({
-        changesFolder: changesPath
+        changesFolder: multipleChangeFilesDir
       } as unknown as RushConfiguration);
       const updatedChangelogs: IChangelog[] = [
         {
@@ -303,9 +302,8 @@ describe(ChangeFiles.name, () => {
     });
 
     it('delete all files when there are hotfixes', async () => {
-      const changesPath: string = `${__dirname}/multipleHotfixChanges`;
       const changeFiles: ChangeFiles = new ChangeFiles({
-        changesFolder: changesPath
+        changesFolder: multipleHotfixChangesDir
       } as unknown as RushConfiguration);
       await expect(changeFiles.deleteAllAsync(terminal, false)).resolves.toEqual(3);
     });