Add tests for test command

Author: leeyi45

lib/buildtools/build.js

@@ -18,7 +18,6 @@ const command = getBuildCommand({
   outfile: './bin/index.js',
   packages: 'external',
   platform: 'node',
-  target: 'node20',
   tsconfig: './tsconfig.json',
   plugins: [{
     // If the given path resolves to something in the root of the repository
@@ -29,10 +28,8 @@ const command = getBuildCommand({
         filter: /^\.{1,2}(\/.+)?/
       }, args => {
         const absolutePath = pathlib.resolve(args.resolveDir, args.path);
-        const { dir, ext, base } = pathlib.parse(absolutePath);
-        // evan claims that esbuild doesn't rewrite import attributes
-        // but i can't get json imports to work properly
-        if (ext === '.json' || dir !== repoRoot) return undefined;
+        const { dir, base } = pathlib.parse(absolutePath);
+        if (dir !== repoRoot) return undefined;
 
         // The new import path should be relative to the bin/index.js file
         const newDirectory = pathlib.relative('./bin', repoRoot);

lib/buildtools/src/commands/__tests__/testing.test.ts

@@ -0,0 +1,56 @@
+import { describe, expect, test, vi } from 'vitest';
+import * as runner from '../../testing/runner.js';
+import * as configs from '../../testing/utils.js';
+import { getTestCommand } from '../testing.js';
+import { getCommandRunner } from './testingUtils.js';
+
+vi.spyOn(process, 'cwd').mockReturnValue('/');
+vi.spyOn(runner, 'runVitest').mockResolvedValue();
+
+describe('Test regular test command', () => {
+  const mockedTestConfiguration = vi.spyOn(configs, 'getTestConfiguration');
+  const runCommand = getCommandRunner(getTestCommand);
+
+  test('Providing both the project directory and pattern', async () => {
+    const mockConfig: configs.GetTestConfigurationResult = {
+      severity: 'success',
+      config: {
+        test: {
+          name: 'Test0'
+        }
+      }
+    };
+
+    mockedTestConfiguration.mockResolvedValueOnce(mockConfig);
+
+    await expect(runCommand('/dir', '/dir/dir1')).commandSuccess();
+    expect(configs.getTestConfiguration).toHaveBeenCalledExactlyOnceWith('/dir', false);
+    expect(runner.runVitest).toHaveBeenCalledExactlyOnceWith('test', ['/dir/dir1'], [mockConfig.config], {});
+  });
+
+  test('Providing both the project directory but no patterns', async () => {
+    const mockConfig: configs.GetTestConfigurationResult = {
+      severity: 'success',
+      config: {
+        test: {
+          name: 'Test0'
+        }
+      }
+    };
+
+    mockedTestConfiguration.mockResolvedValueOnce(mockConfig);
+
+    await expect(runCommand('/dir')).commandSuccess();
+    expect(configs.getTestConfiguration).toHaveBeenCalledExactlyOnceWith('/dir', false);
+    expect(runner.runVitest).toHaveBeenCalledExactlyOnceWith('test', [], [mockConfig.config], {});
+  });
+
+  test('Expect command to exit with no issues if no tests were found', async () => {
+    mockedTestConfiguration.mockResolvedValueOnce({
+      severity: 'success',
+      config: null
+    });
+
+    await expect(runCommand('/dir')).commandSuccess();
+  });
+});

lib/buildtools/src/commands/testing.ts

@@ -20,30 +20,39 @@ export const getTestCommand = () => new Command('test')
   .addOption(watchOption)
   .addOption(updateOption)
   .addOption(coverageOption)
-  .argument('[directory]', 'Directory to search for tests. If no directory is specified, the current working directory is used')
-  .action(async (directory, { mode, ...options }) => {
-    const fullyResolved = resolve(directory ?? process.cwd());
-    const configResult = await getTestConfiguration(fullyResolved, !!options.watch);
+  .argument('[project]', 'Directory that contains the vitest config file')
+  .argument('[patterns...]', 'Test patterns to filter by.')
+  .action(async (project, patterns, { mode, ...options }) => {
+    const fullyResolvedProject = resolve(project ?? process.cwd());
+    const fullyResolvedPatterns = patterns.map(each => resolve(process.cwd(), each));
+
+    const configResult = await getTestConfiguration(fullyResolvedProject, !!options.watch);
 
     if (configResult.severity === 'error') {
       logCommandErrorAndExit(configResult);
     }
 
     if (configResult.config === null) {
-      console.log(chalk.yellowBright(`No tests found for in ${fullyResolved}`));
+      console.log(chalk.yellowBright(`No tests found for ${fullyResolvedProject}`));
       return;
     }
 
-    await runVitest(mode, [fullyResolved], [configResult.config], options);
+    await runVitest(mode, fullyResolvedPatterns, [configResult.config], options);
   });
 
 export const getTestAllCommand = () => new Command('testall')
   .description('Run all tests based on the configuration of the root vitest file')
+  .argument('[patterns...]', 'Test patterns to filter by.')
   .addOption(vitestModeOption)
   .addOption(watchOption)
   .addOption(updateOption)
   .addOption(coverageOption)
-  .action(async ({ mode, ...options }) => {
+  .action(async (patterns, { mode, ...options }) => {
     const configs = await getAllTestConfigurations(!!options.watch);
-    await runVitest(mode, undefined, configs, options);
+    if (configs.length === 0) {
+      console.log(chalk.yellowBright('No tests found.'));
+      return;
+    }
+
+    await runVitest(mode, patterns, configs, options);
   });