Merge branch 'improve-types' into improve-test-runner

storybookjs · Nov 10, 2023 · a6179ff · a6179ff
2 parents 916c55a + c7b4bed
commit a6179ff
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/src/config/jest-playwright.ts b/src/config/jest-playwright.ts
@@ -1,8 +1,9 @@
 import path from 'path';
 import type { Config } from '@jest/types';
 import { getProjectRoot } from '@storybook/core-common';
+import type { Config } from '@jest/types';
 
-const TEST_RUNNER_PATH = process.env.STORYBOOK_TEST_RUNNER_PATH || '@storybook/test-runner';
+const TEST_RUNNER_PATH = process.env.STORYBOOK_TEST_RUNNER_PATH ?? '@storybook/test-runner';
 
 /**
  * IMPORTANT NOTE:
@@ -29,11 +30,11 @@ const getJestPlaywrightConfig = (): Config.InitialOptions => {
   );
   return {
     runner: path.join(presetBasePath, 'runner.js'),
-    globalSetup: require.resolve(TEST_RUNNER_PATH + '/dist/templates/global-setup'),
-    globalTeardown: require.resolve(TEST_RUNNER_PATH + '/dist/templates/global-teardown'),
-    testEnvironment: require.resolve(TEST_RUNNER_PATH + '/dist/templates/custom-environment'),
+    globalSetup: require.resolve(`${TEST_RUNNER_PATH}/dist/templates/global-setup`),
+    globalTeardown: require.resolve(`${TEST_RUNNER_PATH}/dist/templates/global-teardown`),
+    testEnvironment: require.resolve(`${TEST_RUNNER_PATH}/dist/templates/custom-environment`),
     setupFilesAfterEnv: [
-      require.resolve(TEST_RUNNER_PATH + '/dist/templates/jest-setup'),
+      require.resolve(`${TEST_RUNNER_PATH}/dist/templates/jest-setup`),
       expectPlaywrightPath,
       path.join(presetBasePath, 'lib', 'extends.js'),
     ],
@@ -70,9 +71,9 @@ export const getJestConfig = (): Config.InitialOptions => {
 
   const reporters = STORYBOOK_JUNIT ? ['default', jestJunitPath] : ['default'];
 
-  const testMatch = (STORYBOOK_STORIES_PATTERN && STORYBOOK_STORIES_PATTERN.split(';')) || [];
+  const testMatch = STORYBOOK_STORIES_PATTERN?.split(';') ?? [];
 
-  let config: Config.InitialOptions = {
+  const config: Config.InitialOptions = {
     rootDir: getProjectRoot(),
     roots: TEST_ROOT ? [TEST_ROOT] : undefined,
     reporters,

diff --git a/src/playwright/transformPlaywrightJson.test.ts b/src/playwright/transformPlaywrightJson.test.ts
@@ -8,7 +8,7 @@ import {
 describe('Playwright Json', () => {
   describe('v4 indexes', () => {
     it('should generate a test for each story', () => {
-      const input: V4Index = {
+      const input = {
         v: 4,
         entries: {
           'example-header--logged-in': {
@@ -201,7 +201,7 @@ describe('Playwright Json', () => {
     });
 
     it('should skip docs entries', () => {
-      const input: V4Index = {
+      const input = {
         v: 4,
         entries: {
           'example-introduction--page': {
@@ -282,7 +282,7 @@ describe('Playwright Json', () => {
 
   describe('v3 indexes', () => {
     it('should generate a test for each story', () => {
-      const input: V3StoriesIndex = {
+      const input = {
         v: 3,
         stories: {
           'example-header--logged-in': {
@@ -490,7 +490,7 @@ describe('Playwright Json', () => {
     });
 
     it('should skip docs-only stories', () => {
-      const input: V3StoriesIndex = {
+      const input = {
         v: 3,
         stories: {
           'example-introduction--page': {
@@ -577,15 +577,6 @@ describe('Playwright Json', () => {
       `);
     });
   });
-
-  describe('unsupported index', () => {
-    it('throws an error for unsupported versions', () => {
-      const unsupportedVersion: UnsupportedVersion = { v: 1 };
-      expect(() => transformPlaywrightJson(unsupportedVersion)).toThrowError(
-        `Unsupported version ${unsupportedVersion.v}`
-      );
-    });
-  });
 });
 
 describe('unsupported index', () => {

diff --git a/src/typings.d.ts b/src/typings.d.ts
@@ -1,7 +1,6 @@
-import { type TestHook } from './playwright/hooks';
+import { TestHook } from './playwright/hooks';
 import { type setupPage } from './setup-page';
 import type { StoryContext, StoryIdentifiers } from '@storybook/csf';
-
 declare global {
   var __sbPreRender: TestHook;
   var __sbPostRender: TestHook;