Fix testing commands

Author: leeyi45

devserver/package.json

@@ -41,7 +41,7 @@
     "dev": "vite",
     "lint": "eslint src",
     "postinstall": "playwright install --with-deps",
-    "test": "buildtools test .",
+    "test": "buildtools test --project .",
     "tsc": "tsc --project ./tsconfig.json"
   }
 }

lib/buildtools/package.json

@@ -38,6 +38,6 @@
     "lint": "eslint src",
     "prepare": "node ./build.js",
     "tsc": "tsc --project ./tsconfig.json",
-    "test": "buildtools test ."
+    "test": "buildtools test --project ."
   }
 }

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

@@ -1,9 +1,11 @@
 import { describe, expect, test, vi } from 'vitest';
+import { testMocksDir } from '../../__tests__/fixtures.js';
 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.mock(import('../../getGitRoot.js'));
 vi.spyOn(process, 'cwd').mockReturnValue('/');
 vi.spyOn(runner, 'runVitest').mockResolvedValue();
 
@@ -22,13 +24,15 @@ describe('Test regular test command', () => {
     };
 
     mockedTestConfiguration.mockResolvedValueOnce(mockConfig);
+    const projectPath = `${testMocksDir}/dir`;
 
-    await expect(runCommand('/dir', '/dir/dir1')).commandSuccess();
-    expect(configs.getTestConfiguration).toHaveBeenCalledExactlyOnceWith('/dir', false);
-    expect(runner.runVitest).toHaveBeenCalledExactlyOnceWith('test', ['/dir/dir1'], [mockConfig.config], {});
+    await expect(runCommand('--project', projectPath, `${projectPath}/dir1`)).commandSuccess();
+    expect(configs.getTestConfiguration).toHaveBeenCalledExactlyOnceWith(projectPath, false);
+    expect(runner.runVitest).toHaveBeenCalledExactlyOnceWith('test', [`${projectPath}/dir1`], [mockConfig.config], { allowOnly: true });
   });
 
   test('Providing both the project directory but no patterns', async () => {
+    const projectPath = `${testMocksDir}/dir`;
     const mockConfig: configs.GetTestConfigurationResult = {
       severity: 'success',
       config: {
@@ -40,17 +44,23 @@ describe('Test regular test command', () => {
 
     mockedTestConfiguration.mockResolvedValueOnce(mockConfig);
 
-    await expect(runCommand('/dir')).commandSuccess();
-    expect(configs.getTestConfiguration).toHaveBeenCalledExactlyOnceWith('/dir', false);
-    expect(runner.runVitest).toHaveBeenCalledExactlyOnceWith('test', [], [mockConfig.config], {});
+    await expect(runCommand('--project', projectPath)).commandSuccess();
+    expect(configs.getTestConfiguration).toHaveBeenCalledExactlyOnceWith(projectPath, false);
+    expect(runner.runVitest).toHaveBeenCalledExactlyOnceWith('test', [], [mockConfig.config], { allowOnly: true });
   });
 
   test('Expect command to exit with no issues if no tests were found', async () => {
+    const projectPath = `${testMocksDir}/dir`;
     mockedTestConfiguration.mockResolvedValueOnce({
       severity: 'success',
       config: null
     });
 
-    await expect(runCommand('/dir')).commandSuccess();
+    await expect(runCommand('--project', projectPath)).commandSuccess();
+  });
+
+  test('Command should error if the command was called from beyond the git root', async () => {
+    const projectPath = `${testMocksDir}/..`;
+    await expect(runCommand('--project', projectPath)).commandExit();
   });
 });

lib/buildtools/src/commands/testing.ts

@@ -1,7 +1,8 @@
-import { resolve } from 'path';
+import pathlib from 'path';
 import { Command, Option } from '@commander-js/extra-typings';
 import chalk from 'chalk';
 import type { VitestRunMode } from 'vitest/node';
+import { getGitRoot } from '../getGitRoot.js';
 import { runVitest } from '../testing/runner.js';
 import { getAllTestConfigurations, getTestConfiguration } from '../testing/utils.js';
 import { logCommandErrorAndExit } from './commandUtils.js';
@@ -13,18 +14,28 @@ const vitestModeOption = new Option('--mode <mode>', 'Vitest Run Mode. See https
 const watchOption = new Option('-w, --watch', 'Run tests in watch mode');
 const updateOption = new Option('-u, --update', 'Update snapshots');
 const coverageOption = new Option('--coverage');
+const allowOnlyOption = new Option('--no-allow-only', 'Allow the use of .only')
+  .default(!process.env.CI);
 
 export const getTestCommand = () => new Command('test')
   .description('Run test for the specific bundle or tab at the specified directory.')
   .addOption(vitestModeOption)
   .addOption(watchOption)
   .addOption(updateOption)
   .addOption(coverageOption)
-  .argument('[project]', 'Directory that contains the vitest config file')
+  .addOption(allowOnlyOption)
+  .option('-p, --project <directory>', 'Path to the directory that is the root of your test project')
   .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));
+  .action(async (patterns, { mode, project, ...options }) => {
+    const gitRoot = await getGitRoot();
+    const relative = pathlib.relative(project ?? process.cwd(), gitRoot);
+
+    if (relative && !relative.startsWith('..') && !pathlib.isAbsolute(relative)) {
+      logCommandErrorAndExit('Cannot be run from a parent directory of the git root');
+    }
+
+    const fullyResolvedProject = pathlib.resolve(project ?? process.cwd());
+    const fullyResolvedPatterns = patterns.map(each => pathlib.resolve(process.cwd(), each));
 
     const configResult = await getTestConfiguration(fullyResolvedProject, !!options.watch);
 
@@ -47,6 +58,7 @@ export const getTestAllCommand = () => new Command('testall')
   .addOption(watchOption)
   .addOption(updateOption)
   .addOption(coverageOption)
+  .addOption(allowOnlyOption)
   .action(async (patterns, { mode, ...options }) => {
     const configs = await getAllTestConfigurations(!!options.watch);
     if (configs.length === 0) {