Improve refactorability in tests.

Author: iclanton

apps/rush-lib/src/api/test/ChangeFile.test.ts

@@ -7,7 +7,7 @@ import { ChangeFile } from '../ChangeFile';
 import { RushConfiguration } from '../RushConfiguration';
 import { ChangeType } from '../ChangeManagement';
 
-describe('ChangeFile', () => {
+describe(ChangeFile.name, () => {
   it('can add a change', () => {
     const rushFilename: string = path.resolve(__dirname, 'repo', 'rush-npm.json');
     const rushConfiguration: RushConfiguration = RushConfiguration.loadFromConfigurationFile(rushFilename);

apps/rush-lib/src/api/test/CommonVersionsConfiguration.test.ts

@@ -5,7 +5,7 @@ import * as path from 'path';
 
 import { CommonVersionsConfiguration } from '../CommonVersionsConfiguration';
 
-describe('CommonVersionsConfiguration', () => {
+describe(CommonVersionsConfiguration.name, () => {
   it('can load the file', () => {
     const filename: string = path.resolve(__dirname, 'jsonFiles', 'common-versions.json');
     const configuration: CommonVersionsConfiguration = CommonVersionsConfiguration.loadFromFile(filename);

apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts

@@ -4,7 +4,7 @@
 import * as path from 'path';
 import { EnvironmentConfiguration } from '../EnvironmentConfiguration';
 
-describe('EnvironmentConfiguration', () => {
+describe(EnvironmentConfiguration.name, () => {
   let _oldEnv: typeof process.env;
 
   beforeEach(() => {
@@ -17,7 +17,7 @@ describe('EnvironmentConfiguration', () => {
     process.env = _oldEnv;
   });
 
-  describe('validate', () => {
+  describe(EnvironmentConfiguration.validate.name, () => {
     it('correctly allows no environment variables', () => {
       expect(EnvironmentConfiguration.validate).not.toThrow();
     });

apps/rush-lib/src/api/test/EventHooks.test.ts

@@ -5,7 +5,7 @@ import * as path from 'path';
 import { RushConfiguration } from '../RushConfiguration';
 import { Event, EventHooks } from '../EventHooks';
 
-describe('EventHooks', () => {
+describe(EventHooks.name, () => {
   it('loads a post build hook from rush.json', () => {
     const rushFilename: string = path.resolve(__dirname, 'repo', 'rush-npm.json');
     const rushConfiguration: RushConfiguration = RushConfiguration.loadFromConfigurationFile(rushFilename);

apps/rush-lib/src/api/test/LastInstallFlag.test.ts

@@ -2,13 +2,13 @@
 // See LICENSE in the project root for license information.
 
 import * as path from 'path';
+import { FileSystem } from '@rushstack/node-core-library';
 
 import { LastInstallFlag } from '../LastInstallFlag';
-import { FileSystem } from '@rushstack/node-core-library';
 
 const TEMP_DIR: string = path.join(__dirname, 'temp');
 
-describe('LastInstallFlag', () => {
+describe(LastInstallFlag.name, () => {
   beforeEach(() => {
     FileSystem.ensureEmptyFolder(TEMP_DIR);
   });

apps/rush-lib/src/api/test/RushConfiguration.test.ts

@@ -19,7 +19,7 @@ function assertPathProperty(validatedPropertyName: string, absolutePath: string,
   expect(normalizePathForComparison(absolutePath)).toEqual(normalizePathForComparison(resolvedRelativePath));
 }
 
-describe('RushConfiguration', () => {
+describe(RushConfiguration.name, () => {
   let _oldEnv: typeof process.env;
 
   beforeEach(() => {

apps/rush-lib/src/api/test/VersionMismatchFinder.test.ts

@@ -12,7 +12,7 @@ import { VersionMismatchFinderProject } from '../../logic/versionMismatch/Versio
 import { VersionMismatchFinderCommonVersions } from '../../logic/versionMismatch/VersionMismatchFinderCommonVersions';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-describe('VersionMismatchFinder', () => {
+describe(VersionMismatchFinder.name, () => {
   it('finds no mismatches if there are none', () => {
     const projectA: VersionMismatchFinderEntity = new VersionMismatchFinderProject({
       packageName: 'A',

apps/rush-lib/src/api/test/VersionPolicy.test.ts

@@ -7,8 +7,8 @@ import { IPackageJson } from '@rushstack/node-core-library';
 import { VersionPolicyConfiguration } from '../VersionPolicyConfiguration';
 import { VersionPolicy, LockStepVersionPolicy, IndividualVersionPolicy, BumpType } from '../VersionPolicy';
 
-describe('VersionPolicy', () => {
-  describe('LockStepVersion', () => {
+describe(VersionPolicy.name, () => {
+  describe(LockStepVersionPolicy.name, () => {
     const filename: string = path.resolve(__dirname, 'jsonFiles', 'rushWithLockVersion.json');
     const versionPolicyConfig: VersionPolicyConfiguration = new VersionPolicyConfiguration(filename);
     let versionPolicy1: VersionPolicy;
@@ -116,7 +116,7 @@ describe('VersionPolicy', () => {
     });
   });
 
-  describe('IndividualVersionPolicy', () => {
+  describe(IndividualVersionPolicy.name, () => {
     const fileName: string = path.resolve(__dirname, 'jsonFiles', 'rushWithIndividualVersion.json');
     const versionPolicyConfig: VersionPolicyConfiguration = new VersionPolicyConfiguration(fileName);
     const versionPolicy: VersionPolicy = versionPolicyConfig.getVersionPolicy('testPolicy2');

apps/rush-lib/src/cli/actions/test/AddAction.test.ts

@@ -7,8 +7,9 @@ import * as path from 'path';
 
 import { PackageJsonUpdater } from '../../../logic/PackageJsonUpdater';
 import { RushCommandLineParser } from '../../RushCommandLineParser';
+import { AddAction } from '../AddAction';
 
-describe('AddAction', () => {
+describe(AddAction.name, () => {
   describe(`basic "rush add" tests`, () => {
     let doRushAddMock: jest.SpyInstance;
     let oldExitCode: number | undefined;

apps/rush-lib/src/cli/test/RushCommandLineParser.test.ts

@@ -82,8 +82,8 @@ function getCommandLineParserInstance(repoName: string, taskName: string): IPars
 const SPAWN_ARG_ARGS: number = 1;
 const SPAWN_ARG_OPTIONS: number = 2;
 
-describe('RushCommandLineParser', () => {
-  describe('execute', () => {
+describe(RushCommandLineParser.name, () => {
+  describe(RushCommandLineParser.prototype.execute.name, () => {
     afterEach(() => {
       jest.clearAllMocks();
     });

apps/rush-lib/src/cli/test/RushXCommandLine.test.ts

@@ -10,7 +10,7 @@ import { RushConfigurationProject } from '../../api/RushConfigurationProject';
 
 import { RushXCommandLine } from '../RushXCommandLine';
 
-describe('RushXCommandLine', () => {
+describe(RushXCommandLine.name, () => {
   let $argv: string[];
   let $versions: NodeJS.ProcessVersions;
   let executeLifecycleCommandMock: jest.SpyInstance | undefined;
@@ -81,7 +81,7 @@ describe('RushXCommandLine', () => {
     jest.restoreAllMocks();
   });
 
-  describe('launchRushX', () => {
+  describe(RushXCommandLine.launchRushX.name, () => {
     it('prints usage info', () => {
       process.argv = ['node', 'startx.js', '--help'];
       executeLifecycleCommandMock!.mockReturnValue(0);

apps/rush-lib/src/logic/buildCache/test/ProjectBuildCache.test.ts

@@ -16,7 +16,7 @@ interface ITestOptions {
   trackedProjectFiles: string[] | undefined;
 }
 
-describe('ProjectBuildCache', () => {
+describe(ProjectBuildCache.name, () => {
   async function prepareSubject(options: Partial<ITestOptions>): Promise<ProjectBuildCache | undefined> {
     const terminal: Terminal = new Terminal(new StringBufferTerminalProvider());
     const projectChangeAnalyzer = {
@@ -53,7 +53,7 @@ describe('ProjectBuildCache', () => {
     return subject;
   }
 
-  describe('tryGetProjectBuildCache', () => {
+  describe(ProjectBuildCache.tryGetProjectBuildCache.name, () => {
     it('returns a ProjectBuildCache with a calculated cacheId value', async () => {
       const subject: ProjectBuildCache = (await prepareSubject({}))!;
       expect(subject['_cacheId']).toMatchInlineSnapshot(

apps/rush-lib/src/logic/operations/test/AsyncOperationQueue.test.ts

@@ -14,7 +14,7 @@ function nullSort(a: Operation, b: Operation): number {
   return 0;
 }
 
-describe('AsyncOperationQueue', () => {
+describe(AsyncOperationQueue.name, () => {
   it('iterates operations in topological order', async () => {
     const operations = [
       new Operation(new MockOperationRunner('a')!, OperationStatus.Ready),

apps/rush-lib/src/logic/operations/test/OperationSelector.test.ts

@@ -54,7 +54,7 @@ describe(OperationSelector.name, () => {
     commandLineConfiguration = new CommandLineConfiguration(commandLineJson);
   });
 
-  describe('#createOperations', () => {
+  describe(OperationSelector.prototype.createOperations.name, () => {
     it('handles a full build', () => {
       const buildCommand: IPhasedCommand = commandLineConfiguration.commands.get('build')! as IPhasedCommand;
 

apps/rush-lib/src/logic/operations/test/ShellOperationRunner.test.ts

@@ -3,7 +3,7 @@
 
 import { convertSlashesForWindows } from '../ShellOperationRunner';
 
-describe('convertSlashesForWindows()', () => {
+describe(convertSlashesForWindows.name, () => {
   it('converted inputs', () => {
     expect(convertSlashesForWindows('./node_modules/.bin/tslint -c config/tslint.json')).toEqual(
       '.\\node_modules\\.bin\\tslint -c config/tslint.json'

apps/rush-lib/src/logic/operations/test/__snapshots__/OperationSelector.test.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`OperationSelector #createOperations handles a full build 1`] = `
+exports[`OperationSelector createOperations handles a full build 1`] = `
 Array [
   Object {
     "dependencies": Array [],
@@ -619,7 +619,7 @@ Array [
 ]
 `;
 
-exports[`OperationSelector #createOperations handles filtered phases 1`] = `
+exports[`OperationSelector createOperations handles filtered phases 1`] = `
 Array [
   Object {
     "dependencies": Array [],
@@ -689,7 +689,7 @@ Array [
 ]
 `;
 
-exports[`OperationSelector #createOperations handles filtered phases 2`] = `
+exports[`OperationSelector createOperations handles filtered phases 2`] = `
 Array [
   Object {
     "dependencies": Array [
@@ -941,7 +941,7 @@ Array [
 ]
 `;
 
-exports[`OperationSelector #createOperations handles filtered phases on filtered projects 1`] = `
+exports[`OperationSelector createOperations handles filtered phases on filtered projects 1`] = `
 Array [
   Object {
     "dependencies": Array [],
@@ -961,7 +961,7 @@ Array [
 ]
 `;
 
-exports[`OperationSelector #createOperations handles filtered phases on filtered projects 2`] = `
+exports[`OperationSelector createOperations handles filtered phases on filtered projects 2`] = `
 Array [
   Object {
     "dependencies": Array [
@@ -1040,7 +1040,7 @@ Array [
 ]
 `;
 
-exports[`OperationSelector #createOperations handles filtered projects 1`] = `
+exports[`OperationSelector createOperations handles filtered projects 1`] = `
 Array [
   Object {
     "dependencies": Array [],
@@ -1098,7 +1098,7 @@ Array [
 ]
 `;
 
-exports[`OperationSelector #createOperations handles filtered projects 2`] = `
+exports[`OperationSelector createOperations handles filtered projects 2`] = `
 Array [
   Object {
     "dependencies": Array [],

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

@@ -8,14 +8,14 @@ import { IChangelog } from '../../api/Changelog';
 import { ChangeFiles } from '../ChangeFiles';
 import { RushConfiguration } from '../../api/RushConfiguration';
 
-describe('ChangeFiles', () => {
+describe(ChangeFiles.name, () => {
   let rushConfiguration: RushConfiguration;
 
   beforeEach(() => {
     rushConfiguration = {} as RushConfiguration;
   });
 
-  describe('getFiles', () => {
+  describe(ChangeFiles.prototype.getFiles.name, () => {
     it('returns correctly when there is one change file', () => {
       const changesPath: string = path.join(__dirname, 'leafChange');
       const changeFiles: ChangeFiles = new ChangeFiles(changesPath);
@@ -44,7 +44,7 @@ describe('ChangeFiles', () => {
     });
   });
 
-  describe('validate', () => {
+  describe(ChangeFiles.validate.name, () => {
     it('throws when there is a patch in a hotfix branch.', () => {
       const changeFile: string = path.join(__dirname, 'leafChange', 'change1.json');
       const changedPackages: string[] = ['d'];
@@ -97,7 +97,7 @@ describe('ChangeFiles', () => {
     });
   });
 
-  describe('deleteAll', () => {
+  describe(ChangeFiles.prototype.deleteAll.name, () => {
     it('delete all files when there are no prerelease packages', () => {
       const changesPath: string = path.join(__dirname, 'multipleChangeFiles');
       const changeFiles: ChangeFiles = new ChangeFiles(changesPath);

apps/rush-lib/src/logic/test/ChangeManager.test.ts

@@ -7,7 +7,7 @@ import { RushConfiguration } from '../../api/RushConfiguration';
 import { ChangeManager } from '../ChangeManager';
 import { PrereleaseToken } from '../PrereleaseToken';
 
-describe('ChangeManager', () => {
+describe(ChangeManager.name, () => {
   const rushJsonFile: string = path.resolve(__dirname, 'packages', 'rush.json');
   let rushConfiguration: RushConfiguration;
   let changeManager: ChangeManager;
@@ -179,7 +179,7 @@ describe('ChangeManager', () => {
   /* eslint-enable dot-notation */
 });
 
-describe('WorkspaceChangeManager', () => {
+describe(`${ChangeManager.name} (workspace)`, () => {
   const rushJsonFile: string = path.resolve(__dirname, 'workspacePackages', 'rush.json');
   let rushConfiguration: RushConfiguration;
   let changeManager: ChangeManager;

apps/rush-lib/src/logic/test/ChangelogGenerator.test.ts

@@ -10,7 +10,7 @@ import { ChangelogGenerator } from '../ChangelogGenerator';
 import * as path from 'path';
 import { IChangeRequests } from '../PublishUtilities';
 
-describe('updateIndividualChangelog', () => {
+describe(ChangelogGenerator.updateIndividualChangelog.name, () => {
   const rushJsonFile: string = path.resolve(__dirname, 'packages', 'rush.json');
   let rushConfiguration: RushConfiguration;
 
@@ -254,7 +254,7 @@ describe('updateIndividualChangelog', () => {
   });
 });
 
-describe('updateChangelogs', () => {
+describe(ChangelogGenerator.updateChangelogs.name, () => {
   const rushJsonFile: string = path.resolve(__dirname, 'packages', 'rush.json');
   let rushConfiguration: RushConfiguration;
 

apps/rush-lib/src/logic/test/Git.test.ts

@@ -3,8 +3,8 @@
 
 import { Git } from '../Git';
 
-describe('Git', () => {
-  describe('normalizeGitUrlToHttps', () => {
+describe(Git.name, () => {
+  describe(Git.normalizeGitUrlForComparison.name, () => {
     it('correctly normalizes URLs', () => {
       expect(Git.normalizeGitUrlForComparison('invalid.git')).toEqual('invalid');
       expect(Git.normalizeGitUrlForComparison('[email protected]:ExampleOrg/ExampleProject.git')).toEqual(

apps/rush-lib/src/logic/test/LookupByPath.test.ts

@@ -3,7 +3,7 @@
 
 import { LookupByPath } from '../LookupByPath';
 
-describe('iteratePathSegments', () => {
+describe(LookupByPath.iteratePathSegments.name, () => {
   it('returns empty for an empty string', () => {
     const result = [...LookupByPath.iteratePathSegments('')];
     expect(result.length).toEqual(0);
@@ -22,7 +22,7 @@ describe('iteratePathSegments', () => {
   });
 });
 
-describe('findChildPath', () => {
+describe(LookupByPath.prototype.findChildPath.name, () => {
   it('returns empty for an empty tree', () => {
     expect(new LookupByPath().findChildPath('foo')).toEqual(undefined);
   });

apps/rush-lib/src/logic/test/PublishUtilities.test.ts

@@ -57,7 +57,7 @@ function generateVersionPolicySnapshot(allChanges: IChangeRequests): string {
   return lines.join('\n');
 }
 
-describe('findChangeRequests', () => {
+describe(PublishUtilities.findChangeRequests.name, () => {
   let packagesRushConfiguration: RushConfiguration;
   let repoRushConfiguration: RushConfiguration;
 
@@ -461,7 +461,7 @@ describe('findChangeRequests', () => {
   });
 });
 
-describe('sortChangeRequests', () => {
+describe(PublishUtilities.sortChangeRequests.name, () => {
   let rushConfiguration: RushConfiguration;
 
   beforeEach(() => {
@@ -492,7 +492,7 @@ describe('sortChangeRequests', () => {
   });
 });
 
-describe('isRangeDependency', () => {
+describe(PublishUtilities.isRangeDependency.name, () => {
   it('can test ranges', () => {
     expect(PublishUtilities.isRangeDependency('>=1.0.0 <2.0.0')).toEqual(true);
     expect(PublishUtilities.isRangeDependency('>=1.0.0-pr.1 <2.0.0')).toEqual(true);
@@ -502,7 +502,7 @@ describe('isRangeDependency', () => {
   });
 });
 
-describe('getNewDependencyVersion', () => {
+describe(PublishUtilities.getNewDependencyVersion.name, () => {
   it('can update dependency versions', () => {
     const dependencies: { [key: string]: string } = {
       a: '~1.0.0',
@@ -545,7 +545,7 @@ describe('getNewDependencyVersion', () => {
   });
 });
 
-describe('findWorkspaceChangeRequests', () => {
+describe(PublishUtilities.findChangeRequests.name, () => {
   let packagesRushConfiguration: RushConfiguration;
   let repoRushConfiguration: RushConfiguration;
 
@@ -888,7 +888,7 @@ describe('findWorkspaceChangeRequests', () => {
   });
 });
 
-describe('getNewWorkspaceDependencyVersion', () => {
+describe(PublishUtilities.getNewDependencyVersion.name, () => {
   it('can update dependency versions', () => {
     const dependencies: { [key: string]: string } = {
       a: 'workspace:~1.0.0',