Merge branch 'next' into docs_remove_static_assets_flag

.circleci/config.yml

@@ -204,7 +204,7 @@ jobs:
           name: Run tests
           command: |
             cd scripts
-            yarn test --coverage --ci
+            yarn test --coverage
       - store_test_results:
           path: scripts/junit.xml
       - report-workflow-on-failure
@@ -222,7 +222,7 @@ jobs:
           name: Test
           command: |
             cd code
-            yarn test --coverage --ci --maxWorkers=6
+            yarn test --coverage
       - store_test_results:
           path: code/junit.xml
       - persist_to_workspace:

.github/workflows/tests-unit.yml

@@ -24,4 +24,4 @@ jobs:
       - name: install and compile
         run: yarn task --task compile --start-from=auto --no-link
       - name: test
-        run: yarn test --runInBand --ci
+        run: yarn test

.gitignore

@@ -51,4 +51,5 @@ code/playwright-report/
 code/playwright/.cache/
 code/bench-results/
 
-/packs
+/packs
+code/.nx/cache

code/.eslintignore

@@ -16,6 +16,5 @@ ember-output
 !.babelrc.js
 !.eslintrc.js
 !.eslintrc-markdown.js
-!.jest.config.js
 !.storybook
 

code/.eslintrc.js

@@ -23,11 +23,15 @@ module.exports = {
   },
   plugins: ['local-rules'],
   rules: {
+    // remove as shared eslint has jest rules removed
+    'jest/no-standalone-expect': 'off',
+    'jest/no-done-callback': 'off',
+    'jest/no-deprecated-functions': 'off',
+
     'eslint-comments/disable-enable-pair': ['error', { allowWholeFile: true }],
     'eslint-comments/no-unused-disable': 'error',
     'react-hooks/rules-of-hooks': 'off',
     'import/extensions': 'off', // for mjs, we sometimes need extensions
-    'jest/no-done-callback': 'off',
     'jsx-a11y/control-has-associated-label': 'off',
     '@typescript-eslint/dot-notation': [
       'error',
@@ -53,15 +57,7 @@ module.exports = {
       },
     },
     {
-      files: [
-        '*.js',
-        '*.jsx',
-        '*.json',
-        '*.html',
-        '**/.storybook/*.ts',
-        '**/.storybook/*.tsx',
-        'setup-jest.ts',
-      ],
+      files: ['*.js', '*.jsx', '*.json', '*.html', '**/.storybook/*.ts', '**/.storybook/*.tsx'],
       parserOptions: {
         project: null,
       },
@@ -197,12 +193,6 @@ module.exports = {
         'spaced-comment': 'off',
       },
     },
-    {
-      files: ['**/e2e-tests/**/*'],
-      rules: {
-        'jest/no-test-callback': 'off', // These aren't jest tests
-      },
-    },
     {
       files: ['**/builder-vite/input/iframe.html'],
       rules: {
@@ -218,6 +208,7 @@ module.exports = {
     },
     {
       files: ['**/*.ts', '!**/*.test.*', '!**/*.spec.*'],
+      excludedFiles: ['**/*.test.*', '**/*.mockdata.*'],
       rules: {
         'local-rules/no-uncategorized-errors': 'warn',
       },

code/__mocks__/fs-extra.ts

@@ -0,0 +1,40 @@
+import { vi } from 'vitest';
+
+// This is a custom function that our tests can use during setup to specify
+// what the files on the "mock" filesystem should look like when any of the
+// `fs` APIs are used.
+let mockFiles = Object.create(null);
+
+// eslint-disable-next-line no-underscore-dangle, @typescript-eslint/naming-convention
+export function __setMockFiles(newMockFiles: Record<string, string | null>) {
+  mockFiles = newMockFiles;
+}
+
+// A custom version of `readdirSync` that reads from the special mocked out
+// file list set via __setMockFiles
+export const writeFile = vi.fn(async (filePath: string, content: string) => {
+  mockFiles[filePath] = content;
+});
+export const readFile = vi.fn(async (filePath: string) => mockFiles[filePath]);
+export const readFileSync = vi.fn((filePath = '') => mockFiles[filePath]);
+export const existsSync = vi.fn((filePath: string) => !!mockFiles[filePath]);
+export const readJson = vi.fn((filePath = '') => JSON.parse(mockFiles[filePath]));
+export const readJsonSync = vi.fn((filePath = '') => JSON.parse(mockFiles[filePath]));
+export const lstatSync = vi.fn((filePath: string) => ({
+  isFile: () => !!mockFiles[filePath],
+}));
+export const writeJson = vi.fn((filePath, json, { spaces } = {}) => {
+  mockFiles[filePath] = JSON.stringify(json, null, spaces);
+});
+
+export default {
+  __setMockFiles,
+  writeFile,
+  readFile,
+  readFileSync,
+  existsSync,
+  readJson,
+  readJsonSync,
+  lstatSync,
+  writeJson,
+};

code/__mocks__/fs.js

@@ -1,4 +1,6 @@
-const fs = jest.createMockFromModule('fs');
+import { vi } from 'vitest';
+
+const fs = vi.createMockFromModule('fs');
 
 // This is a custom function that our tests can use during setup to specify
 // what the files on the "mock" filesystem should look like when any of the

code/addons/a11y/src/a11yRunner.test.ts

@@ -1,22 +1,23 @@
+import type { Mock } from 'vitest';
+import { describe, beforeEach, it, expect, vi } from 'vitest';
 import { addons } from '@storybook/preview-api';
 import { EVENTS } from './constants';
 
-jest.mock('@storybook/preview-api');
-const mockedAddons = addons as jest.Mocked<typeof addons>;
+vi.mock('@storybook/preview-api');
+const mockedAddons = vi.mocked(addons);
 
 describe('a11yRunner', () => {
-  let mockChannel: { on: jest.Mock; emit?: jest.Mock };
+  let mockChannel: { on: Mock; emit?: Mock };
 
   beforeEach(() => {
     mockedAddons.getChannel.mockReset();
 
-    mockChannel = { on: jest.fn(), emit: jest.fn() };
+    mockChannel = { on: vi.fn(), emit: vi.fn() };
     mockedAddons.getChannel.mockReturnValue(mockChannel as any);
   });
 
-  it('should listen to events', () => {
-    // eslint-disable-next-line global-require
-    require('./a11yRunner');
+  it('should listen to events', async () => {
+    await import('./a11yRunner');
 
     expect(mockedAddons.getChannel).toHaveBeenCalled();
     expect(mockChannel.on).toHaveBeenCalledWith(EVENTS.REQUEST, expect.any(Function));

code/addons/a11y/src/components/A11YPanel.test.tsx

@@ -1,17 +1,18 @@
+import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest';
 import React from 'react';
-import { render, waitFor, fireEvent, act } from '@testing-library/react';
+import { render, waitFor, fireEvent, act, cleanup } from '@testing-library/react';
 
 import { ThemeProvider, themes, convert } from '@storybook/theming';
 import * as api from '@storybook/manager-api';
 
 import { A11YPanel } from './A11YPanel';
 import { EVENTS } from '../constants';
 
-jest.mock('@storybook/manager-api');
+vi.mock('@storybook/manager-api');
 
 global.ResizeObserver = require('resize-observer-polyfill');
 
-const mockedApi = api as jest.Mocked<typeof api>;
+const mockedApi = vi.mocked(api);
 
 const axeResult = {
   incomplete: [
@@ -67,14 +68,18 @@ describe('A11YPanel', () => {
     mockedApi.useAddonState.mockReset();
 
     mockedApi.useAddonState.mockImplementation((_, defaultState) => React.useState(defaultState));
-    mockedApi.useChannel.mockReturnValue(jest.fn());
+    mockedApi.useChannel.mockReturnValue(vi.fn());
     mockedApi.useParameter.mockReturnValue({ manual: false });
     const state: Partial<api.State> = { storyId: 'jest' };
     // Lazy to mock entire state
     mockedApi.useStorybookState.mockReturnValue(state as any);
     mockedApi.useAddonState.mockImplementation(React.useState);
   });
 
+  afterEach(() => {
+    cleanup();
+  });
+
   it('should render', () => {
     const { container } = render(<A11YPanel />);
     expect(container.firstChild).toBeTruthy();
@@ -95,16 +100,27 @@ describe('A11YPanel', () => {
     expect(getByText(/Initializing/)).toBeTruthy();
   });
 
-  it('should handle "manual" status', async () => {
+  it('should set running status on event', async () => {
+    const { getByText } = render(<ThemedA11YPanel />);
+    const useChannelArgs = mockedApi.useChannel.mock.calls[0][0];
+    act(() => useChannelArgs[EVENTS.RUNNING]());
+    await waitFor(() => {
+      expect(getByText(/Please wait while the accessibility scan is running/)).toBeTruthy();
+    });
+  });
+
+  // TODO: The tests below are skipped because of unknown issues with ThemeProvider
+  // which cause errors like TypeError: Cannot read properties of undefined (reading 'defaultText')
+  it.skip('should handle "manual" status', async () => {
     mockedApi.useParameter.mockReturnValue({ manual: true });
     const { getByText } = render(<ThemedA11YPanel />);
     await waitFor(() => {
       expect(getByText(/Manually run the accessibility scan/)).toBeTruthy();
     });
   });
 
-  it('should handle "running" status', async () => {
-    const emit = jest.fn();
+  it.skip('should handle "running" status', async () => {
+    const emit = vi.fn();
     mockedApi.useChannel.mockReturnValue(emit);
     mockedApi.useParameter.mockReturnValue({ manual: true });
     const { getByRole, getByText } = render(<ThemedA11YPanel />);
@@ -118,16 +134,7 @@ describe('A11YPanel', () => {
     });
   });
 
-  it('should set running status on event', async () => {
-    const { getByText } = render(<ThemedA11YPanel />);
-    const useChannelArgs = mockedApi.useChannel.mock.calls[0][0];
-    act(() => useChannelArgs[EVENTS.RUNNING]());
-    await waitFor(() => {
-      expect(getByText(/Please wait while the accessibility scan is running/)).toBeTruthy();
-    });
-  });
-
-  it('should handle "ran" status', async () => {
+  it.skip('should handle "ran" status', async () => {
     const { getByText } = render(<ThemedA11YPanel />);
     const useChannelArgs = mockedApi.useChannel.mock.calls[0][0];
     act(() => useChannelArgs[EVENTS.RESULT](axeResult));

code/addons/a11y/src/components/A11yContext.test.tsx

@@ -1,15 +1,16 @@
+import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest';
 import * as React from 'react';
 import type { AxeResults } from 'axe-core';
-import { render, act } from '@testing-library/react';
+import { render, act, cleanup } from '@testing-library/react';
 import * as api from '@storybook/manager-api';
 import { STORY_CHANGED } from '@storybook/core-events';
 import { HIGHLIGHT } from '@storybook/addon-highlight';
 
 import { A11yContextProvider, useA11yContext } from './A11yContext';
 import { EVENTS } from '../constants';
 
-jest.mock('@storybook/manager-api');
-const mockedApi = api as jest.Mocked<typeof api>;
+vi.mock('@storybook/manager-api');
+const mockedApi = vi.mocked(api);
 
 const storyId = 'jest';
 const axeResult: Partial<AxeResults> = {
@@ -51,14 +52,18 @@ const axeResult: Partial<AxeResults> = {
 };
 
 describe('A11YPanel', () => {
-  const getCurrentStoryData = jest.fn();
+  afterEach(() => {
+    cleanup();
+  });
+
+  const getCurrentStoryData = vi.fn();
   beforeEach(() => {
     mockedApi.useChannel.mockReset();
     mockedApi.useStorybookApi.mockReset();
     mockedApi.useAddonState.mockReset();
 
     mockedApi.useAddonState.mockImplementation((_, defaultState) => React.useState(defaultState));
-    mockedApi.useChannel.mockReturnValue(jest.fn());
+    mockedApi.useChannel.mockReturnValue(vi.fn());
     getCurrentStoryData.mockReset().mockReturnValue({ id: storyId, type: 'story' });
     mockedApi.useStorybookApi.mockReturnValue({ getCurrentStoryData } as any);
   });
@@ -73,7 +78,7 @@ describe('A11YPanel', () => {
   });
 
   it('should not render when inactive', () => {
-    const emit = jest.fn();
+    const emit = vi.fn();
     mockedApi.useChannel.mockReturnValue(emit);
     const { queryByTestId } = render(
       <A11yContextProvider active={false}>
@@ -85,15 +90,15 @@ describe('A11YPanel', () => {
   });
 
   it('should emit request when moving from inactive to active', () => {
-    const emit = jest.fn();
+    const emit = vi.fn();
     mockedApi.useChannel.mockReturnValue(emit);
     const { rerender } = render(<A11yContextProvider active={false} />);
     rerender(<A11yContextProvider active />);
     expect(emit).toHaveBeenLastCalledWith(EVENTS.REQUEST, storyId);
   });
 
   it('should emit highlight with no values when inactive', () => {
-    const emit = jest.fn();
+    const emit = vi.fn();
     mockedApi.useChannel.mockReturnValue(emit);
     const { rerender } = render(<A11yContextProvider active />);
     rerender(<A11yContextProvider active={false} />);