Set up vitest workspaces, re-enable ssr test (adazzle#3592)

nstepien · web-flow · commit 75fc5f37d69e · 2024-09-05T16:57:22.000Z
diff --git a/test/browser/TextEditor.test.tsx b/test/browser/TextEditor.test.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import DataGrid, { textEditor } from '../src';
-import type { Column } from '../src';
+import DataGrid, { textEditor } from '../../src';
+import type { Column } from '../../src';
 import { getCells } from './utils';
 
 interface Row {
diff --git a/test/browser/TreeDataGrid.test.tsx b/test/browser/TreeDataGrid.test.tsx
@@ -2,11 +2,11 @@ import { useState } from 'react';
 import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import type { Column } from '../src';
-import { SelectColumn, textEditor, TreeDataGrid } from '../src';
-import { focusSinkClassname } from '../src/style/core';
-import { rowSelected } from '../src/style/row';
-import type { PasteEvent } from '../src/types';
+import type { Column } from '../../src';
+import { SelectColumn, textEditor, TreeDataGrid } from '../../src';
+import { focusSinkClassname } from '../../src/style/core';
+import { rowSelected } from '../../src/style/row';
+import type { PasteEvent } from '../../src/types';
 import {
   copySelectedCell,
   getCellsAtRowIndex,
diff --git a/test/browser/column/cellClass.test.ts b/test/browser/column/cellClass.test.ts
@@ -1,5 +1,5 @@
-import type { Column } from '../../src';
-import { cellClassname } from '../../src/style/cell';
+import type { Column } from '../../../src';
+import { cellClassname } from '../../../src/style/cell';
 import { getCells, setup } from '../utils';
 
 interface Row {
diff --git a/test/browser/column/colSpan.test.ts b/test/browser/column/colSpan.test.ts
@@ -1,6 +1,6 @@
 import userEvent from '@testing-library/user-event';
 
-import type { Column } from '../../src';
+import type { Column } from '../../../src';
 import { getCellsAtRowIndex, getHeaderCells, setup, validateCellPosition } from '../utils';
 
 describe('colSpan', () => {
diff --git a/test/browser/column/draggable.test.ts b/test/browser/column/draggable.test.ts
@@ -1,7 +1,7 @@
 import { act } from 'react';
 import { userEvent } from '@vitest/browser/context';
 
-import type { Column } from '../../src';
+import type { Column } from '../../../src';
 import { getHeaderCells, setup } from '../utils';
 
 const columns: readonly Column<never>[] = [
diff --git a/test/browser/column/frozen.test.ts b/test/browser/column/frozen.test.ts
@@ -1,5 +1,5 @@
-import type { Column } from '../../src';
-import { cellClassname, cellFrozenClassname } from '../../src/style/cell';
+import type { Column } from '../../../src';
+import { cellClassname, cellFrozenClassname } from '../../../src/style/cell';
 import { getHeaderCells, setup } from '../utils';
 
 test('frozen column have a specific class, and are stable-sorted before non-frozen columns', () => {
diff --git a/test/browser/column/grouping.test.ts b/test/browser/column/grouping.test.ts
@@ -1,7 +1,7 @@
 import { screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import type { ColumnOrColumnGroup } from '../../src';
+import type { ColumnOrColumnGroup } from '../../../src';
 import { getSelectedCell, setup, validateCellPosition } from '../utils';
 
 const columns: readonly ColumnOrColumnGroup<NonNullable<unknown>>[] = [
diff --git a/test/browser/column/headerCellClass.test.ts b/test/browser/column/headerCellClass.test.ts
@@ -1,5 +1,5 @@
-import type { Column, ColumnGroup } from '../../src';
-import { cellClassname } from '../../src/style/cell';
+import type { Column, ColumnGroup } from '../../../src';
+import { cellClassname } from '../../../src/style/cell';
 import { getHeaderCells, setup } from '../utils';
 
 test('headerCellClass is either nullish or a string', () => {
diff --git a/test/browser/column/key.test.ts b/test/browser/column/key.test.ts
@@ -1,4 +1,4 @@
-import type { Column } from '../../src';
+import type { Column } from '../../../src';
 import { setup } from '../utils';
 
 test('key is escaped in query selectors', () => {
diff --git a/test/browser/column/name.test.tsx b/test/browser/column/name.test.tsx
@@ -1,4 +1,4 @@
-import type { Column } from '../../src';
+import type { Column } from '../../../src';
 import { getHeaderCells, setup } from '../utils';
 
 test('name is either a string or an element', () => {
diff --git a/test/browser/column/renderCell.test.tsx b/test/browser/column/renderCell.test.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import DataGrid from '../../src';
-import type { Column } from '../../src';
+import DataGrid from '../../../src';
+import type { Column } from '../../../src';
 import { getCells, getCellsAtRowIndex, setup } from '../utils';
 
 interface Row {
diff --git a/test/browser/column/renderEditCell.test.tsx b/test/browser/column/renderEditCell.test.tsx
@@ -3,8 +3,8 @@ import { createPortal } from 'react-dom';
 import { act, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import DataGrid from '../../src';
-import type { Column, DataGridProps } from '../../src';
+import DataGrid from '../../../src';
+import type { Column, DataGridProps } from '../../../src';
 import { getCellsAtRowIndex, getGrid, getSelectedCell, scrollGrid } from '../utils';
 
 interface Row {
diff --git a/test/browser/column/renderHeaderCell.test.tsx b/test/browser/column/renderHeaderCell.test.tsx
@@ -1,4 +1,4 @@
-import type { Column } from '../../src';
+import type { Column } from '../../../src';
 import { getHeaderCells, setup } from '../utils';
 
 test('renderHeaderCell is either undefined or a component', () => {
diff --git a/test/browser/column/renderSummaryCell.test.tsx b/test/browser/column/renderSummaryCell.test.tsx
@@ -1,4 +1,4 @@
-import type { Column } from '../../src';
+import type { Column } from '../../../src';
 import { getCells, setup } from '../utils';
 
 interface SummaryRow {
diff --git a/test/browser/column/resizable.test.tsx b/test/browser/column/resizable.test.tsx
@@ -1,8 +1,8 @@
 import { act } from 'react';
 import { commands, userEvent } from '@vitest/browser/context';
 
-import type { Column } from '../../src';
-import { resizeHandleClassname } from '../../src/HeaderCell';
+import type { Column } from '../../../src';
+import { resizeHandleClassname } from '../../../src/HeaderCell';
 import { getGrid, getHeaderCells, setup } from '../utils';
 
 interface Row {
diff --git a/test/browser/column/summaryCellClass.test.ts b/test/browser/column/summaryCellClass.test.ts
@@ -1,6 +1,6 @@
-import type { Column } from '../../src';
-import { cellClassname as cellClass } from '../../src/style/cell';
-import { summaryCellClassname } from '../../src/SummaryCell';
+import type { Column } from '../../../src';
+import { cellClassname as cellClass } from '../../../src/style/cell';
+import { summaryCellClassname } from '../../../src/SummaryCell';
 import { getCells, setup } from '../utils';
 
 interface SummaryRow {
diff --git a/test/browser/columnOrder.test.tsx b/test/browser/columnOrder.test.tsx
@@ -1,7 +1,7 @@
 import { render } from '@testing-library/react';
 
-import DataGrid, { SelectColumn, TreeDataGrid } from '../src';
-import type { Column } from '../src';
+import DataGrid, { SelectColumn, TreeDataGrid } from '../../src';
+import type { Column } from '../../src';
 import { getHeaderCells } from './utils';
 
 const frozen1: Column<unknown> = {
diff --git a/test/browser/copyPaste.test.tsx b/test/browser/copyPaste.test.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react';
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import DataGrid from '../src';
-import type { Column, PasteEvent } from '../src';
+import DataGrid from '../../src';
+import type { Column, PasteEvent } from '../../src';
 import { copySelectedCell, getCellsAtRowIndex, getSelectedCell, pasteSelectedCell } from './utils';
 
 interface Row {
diff --git a/test/browser/direction.test.ts b/test/browser/direction.test.ts
@@ -1,6 +1,6 @@
 import userEvent from '@testing-library/user-event';
 
-import type { Column } from '../src';
+import type { Column } from '../../src';
 import { getGrid, getSelectedCell, setup } from './utils';
 
 interface Row {
diff --git a/test/browser/dragFill.test.tsx b/test/browser/dragFill.test.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react';
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import DataGrid from '../src';
-import type { Column, FillEvent } from '../src';
+import DataGrid from '../../src';
+import type { Column, FillEvent } from '../../src';
 import { getCellsAtRowIndex, getRows } from './utils';
 
 interface Row {
diff --git a/test/browser/events.test.tsx b/test/browser/events.test.tsx
@@ -1,8 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import DataGrid from '../src';
-import type { Column, DataGridProps } from '../src';
+import DataGrid from '../../src';
+import type { Column, DataGridProps } from '../../src';
 import { getCellsAtRowIndex } from './utils';
 
 interface Row {
diff --git a/test/browser/keyboardNavigation.test.tsx b/test/browser/keyboardNavigation.test.tsx
@@ -1,8 +1,8 @@
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import type { Column } from '../src';
-import DataGrid, { SelectColumn } from '../src';
+import type { Column } from '../../src';
+import DataGrid, { SelectColumn } from '../../src';
 import {
   getCellsAtRowIndex,
   getSelectedCell,
diff --git a/test/browser/renderers.test.tsx b/test/browser/renderers.test.tsx
@@ -2,8 +2,12 @@ import { useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import DataGrid, { DataGridDefaultRenderersProvider, renderSortIcon, SelectColumn } from '../src';
-import type { Column, DataGridProps, RenderSortStatusProps, SortColumn } from '../src';
+import DataGrid, {
+  DataGridDefaultRenderersProvider,
+  renderSortIcon,
+  SelectColumn
+} from '../../src';
+import type { Column, DataGridProps, RenderSortStatusProps, SortColumn } from '../../src';
 import { getHeaderCells, getRows, setup } from './utils';
 
 interface Row {
diff --git a/test/browser/rowClass.test.ts b/test/browser/rowClass.test.ts
@@ -1,5 +1,5 @@
-import type { Column } from '../src';
-import { rowClassname } from '../src/style/row';
+import type { Column } from '../../src';
+import { rowClassname } from '../../src/style/row';
 import { getRows, setup } from './utils';
 
 interface Row {
diff --git a/test/browser/rowHeight.test.ts b/test/browser/rowHeight.test.ts
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import type { Column, DataGridProps } from '../src';
+import type { Column, DataGridProps } from '../../src';
 import { getRows, setup } from './utils';
 
 type Row = number;
diff --git a/test/browser/rowSelection.test.tsx b/test/browser/rowSelection.test.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react';
 import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import DataGrid, { SelectColumn } from '../src';
-import type { Column } from '../src';
+import DataGrid, { SelectColumn } from '../../src';
+import type { Column } from '../../src';
 import { getCellsAtRowIndex, getRows } from './utils';
 
 interface Row {
diff --git a/test/browser/scrollToCell.test.tsx b/test/browser/scrollToCell.test.tsx
@@ -2,9 +2,9 @@ import { useRef } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import type { Column, DataGridHandle } from '../src';
-import DataGrid from '../src';
-import type { PartialPosition } from '../src/ScrollToCell';
+import type { Column, DataGridHandle } from '../../src';
+import DataGrid from '../../src';
+import type { PartialPosition } from '../../src/ScrollToCell';
 import { getGrid } from './utils';
 
 type Row = undefined;
diff --git a/test/browser/sorting.test.tsx b/test/browser/sorting.test.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import DataGrid from '../src';
-import type { Column, SortColumn } from '../src/types';
+import DataGrid from '../../src';
+import type { Column, SortColumn } from '../../src/types';
 import { getHeaderCells } from './utils';
 
 const columns: readonly Column<never>[] = [
diff --git a/test/browser/utils.tsx b/test/browser/utils.tsx
@@ -2,8 +2,8 @@ import { act, render, screen } from '@testing-library/react';
 import { userEvent } from '@vitest/browser/context';
 import { css } from '@linaria/core';
 
-import DataGrid from '../src/';
-import type { DataGridProps } from '../src/';
+import DataGrid from '../../src';
+import type { DataGridProps } from '../../src';
 
 export function setup<R, SR, K extends React.Key = React.Key>(props: DataGridProps<R, SR, K>) {
   render(
diff --git a/test/browser/virtualization.test.ts b/test/browser/virtualization.test.ts
@@ -1,4 +1,4 @@
-import type { Column } from '../src';
+import type { Column } from '../../src';
 import {
   getCells,
   getCellsAtRowIndex,
diff --git a/test/node/ssr.test.tsx b/test/node/ssr.test.tsx
@@ -1,8 +1,7 @@
-// @vitest-environment node
 import { renderToString } from 'react-dom/server';
 
-import DataGrid from '../src';
-import type { Column } from '../src';
+import DataGrid from '../../src';
+import type { Column } from '../../src';
 
 interface Row {
   id: number;
@@ -23,14 +22,10 @@ function App() {
   return <DataGrid columns={columns} rows={rows} />;
 }
 
-// biome-ignore lint/suspicious/noSkippedTests: <explanation>
-test.skip('basic server-side rendering (SSR) support', () => {
-  // make sure we're not running in the JSDOM environment
+test('basic server-side rendering (SSR) support', () => {
+  // make sure we're not running in a browser environment
   expect(globalThis.window).toBeUndefined();
 
   const html = renderToString(<App />);
   expect(html).not.toHaveLength(0);
-
-  // make sure `@testing-library/jest-dom` does not polyfill `window.CSS`
-  expect(typeof CSS).toBe('undefined');
 });
diff --git a/tsconfig.vite.json b/tsconfig.vite.json
@@ -4,5 +4,5 @@
     "skipLibCheck": true,
     "types": ["@vitest/browser/providers/playwright"]
   },
-  "include": ["vite.config.ts"]
+  "include": ["vite.config.ts", "vitest.workspace.ts"]
 }
diff --git a/vite.config.ts b/vite.config.ts
@@ -2,24 +2,9 @@ import react from '@vitejs/plugin-react';
 import wyw from '@wyw-in-js/vite';
 import browserslist from 'browserslist';
 import { defineConfig } from 'vite';
-import type { BrowserCommand } from 'vitest/node';
 
 const isCI = process.env.CI === 'true';
 
-// TODO: remove when `userEvent.pointer` is supported
-const resizeColumn: BrowserCommand<[resizeBy: number]> = async (context, resizeBy) => {
-  const page = context.page;
-  const frame = await context.frame();
-  const resizeHandle = frame.locator('[role="columnheader"][aria-colindex="2"]  div');
-  const { x, y } = (await resizeHandle.boundingBox())!;
-  await resizeHandle.hover({
-    position: { x: 5, y: 5 }
-  });
-  await page.mouse.down();
-  await page.mouse.move(x + resizeBy + 5, y);
-  await page.mouse.up();
-};
-
 export default defineConfig(({ command }) => ({
   base: '/react-data-grid/',
   cacheDir: '.cache/vite',
@@ -56,14 +41,7 @@ export default defineConfig(({ command }) => ({
     },
     testTimeout: isCI ? 10000 : 5000,
     setupFiles: ['test/setup.ts'],
-    browser: {
-      enabled: true,
-      name: 'chromium',
-      provider: 'playwright',
-      commands: { resizeColumn },
-      viewport: { width: 1920, height: 1080 },
-      headless: true
-    },
+    reporters: ['basic'],
     restoreMocks: true,
     sequence: {
       shuffle: true
diff --git a/vitest.workspace.ts b/vitest.workspace.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { Column } from '../../src';`
	`1`	`+import type { Column } from '../../../src';`
`2`	`2`	`import { setup } from '../utils';`
`3`	`3`
`4`	`4`	`test('key is escaped in query selectors', () => {`