fixes

Author: yannbf

src/config/jest-playwright.ts

@@ -26,8 +26,6 @@ const getJestPlaywrightConfig = (): Config.InitialOptions => {
   const expectPlaywrightPath = path.dirname(require.resolve('expect-playwright'));
   return {
     runner: path.join(resolvedRunnerPath, 'dist/jest-playwright-entries/runner.js'),
-    globalSetup: path.join(resolvedRunnerPath, 'playwright/global-setup.js'),
-    globalTeardown: path.join(resolvedRunnerPath, 'playwright/global-teardown.js'),
     testEnvironment: path.join(resolvedRunnerPath, 'playwright/custom-environment.js'),
     setupFilesAfterEnv: [
       path.join(resolvedRunnerPath, 'playwright/jest-setup.js'),

src/test-storybook.ts

@@ -91,7 +91,7 @@ async function reportCoverage() {
     execSync(
       `node ${nycBinFullPath} report --reporter=text --reporter=lcov -t ${coverageFolder} --report-dir ${coverageFolder}`,
       {
-        stdio: 'inherit',
+        stdio: 'pipe',
         cwd: process.cwd(),
       }
     );
@@ -158,48 +158,37 @@ async function executeJestPlaywright(args: JestOptions) {
     ' '
   )} --config "${jestConfigPath}" --color`;
 
-  const runThing = async (type: 'previous' | 'current') => {
-    if (type === 'previous') {
-      execSync(command, {
-        stdio: 'inherit',
-        cwd: process.cwd(),
-      });
-    } else {
-      const child = spawn(command, {
-        shell: true,
-        cwd: process.cwd(),
-        stdio: ['inherit', 'pipe'],
-      });
-      const shouldLog = (str: string) => {
-        return (
-          !str.includes('watchman') &&
-          !str.includes('DeprecationWarning') &&
-          !str.includes('ExperimentalWarning')
-        );
-      };
-      const exitCode = await new Promise<number>((resolve) => {
-        // filter out messages like DeprecationWarning and ExperimentalWarning
-        child.stdout?.on('data', (data) => {
-          const str = data.toString();
-          if (shouldLog(str)) {
-            process.stdout.write(data);
-          }
-        });
-        child.stderr?.on('data', (data) => {
-          const str = data.toString();
-          if (shouldLog(str)) {
-            process.stderr.write(data);
-          }
-        });
-
-        child.on('exit', (exitCode) => resolve(exitCode || 0));
-      });
-
-      process.exit(exitCode);
-    }
+  const child = spawn(command, {
+    shell: true,
+    cwd: process.cwd(),
+    stdio: ['inherit', 'pipe'],
+  });
+  const shouldLog = (str: string) => {
+    return (
+      !str.includes('watchman') &&
+      !str.includes('DeprecationWarning') &&
+      !str.includes('ExperimentalWarning')
+    );
   };
+  const exitCode = await new Promise<number>((resolve) => {
+    // filter out messages like DeprecationWarning and ExperimentalWarning
+    child.stdout?.on('data', (data) => {
+      const str = data.toString();
+      if (shouldLog(str)) {
+        process.stdout.write(data);
+      }
+    });
+    child.stderr?.on('data', (data) => {
+      const str = data.toString();
+      if (shouldLog(str)) {
+        process.stderr.write(data);
+      }
+    });
+
+    child.on('exit', (exitCode) => resolve(exitCode || 0));
+  });
 
-  await runThing('previous');
+  process.exit(exitCode);
 }
 
 async function checkStorybook(url: string) {
@@ -298,7 +287,9 @@ function ejectConfiguration() {
   }
 
   // copy contents of origin and replace ../dist with @storybook/test-runner
-  const content = fs.readFileSync(origin, 'utf-8').replace(/..\/dist/g, '@storybook/test-runner');
+  const content = fs
+    .readFileSync(origin, 'utf-8')
+    .replace('../dist/index.js', '@storybook/test-runner');
   fs.writeFileSync(destination, content);
   log(`Configuration file successfully generated at ${destination}`);
 }