Fix E2E tests

code/e2e-tests/addon-interactions.spec.ts

@@ -1,17 +1,17 @@
 import { expect, test } from '@playwright/test';
 import process from 'process';
 
-import { SbPage } from './util';
+import { SbPage, hasVitestIntegration } from './util';
 
 const storybookUrl = process.env.STORYBOOK_URL || 'http://localhost:8001';
 const templateName = process.env.STORYBOOK_TEMPLATE_NAME || '';
 
 test.describe('addon-interactions', () => {
-  // TODO: fix the skip statement below when we introduce a sandbox that tests interactions
   test.skip(
-    templateName !== 'todo-sandbox-with-addon-interactions',
+    hasVitestIntegration,
     `Skipping ${templateName}, which does not have addon-interactions set up.`
   );
+
   test.beforeEach(async ({ page }) => {
     await page.goto(storybookUrl);
     await new SbPage(page, expect).waitUntilLoaded();

code/e2e-tests/addon-test.spec.ts

@@ -1,12 +1,17 @@
 import { expect, test } from '@playwright/test';
 import process from 'process';
 
-import { SbPage } from './util';
+import { SbPage, hasVitestIntegration } from './util';
 
 const storybookUrl = process.env.STORYBOOK_URL || 'http://localhost:8001';
 const templateName = process.env.STORYBOOK_TEMPLATE_NAME || '';
 
 test.describe('addon-test', () => {
+  test.skip(
+    !hasVitestIntegration,
+    `Skipping ${templateName}, which does not have addon-test set up.`
+  );
+
   test.beforeEach(async ({ page }) => {
     await page.goto(storybookUrl);
     await new SbPage(page, expect).waitUntilLoaded();

code/e2e-tests/preview-api.spec.ts

@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
 import process from 'process';
 
-import { SbPage } from './util';
+import { SbPage, hasVitestIntegration } from './util';
 
 const storybookUrl = process.env.STORYBOOK_URL || 'http://localhost:8001';
 const templateName = process.env.STORYBOOK_TEMPLATE_NAME || '';
@@ -26,8 +26,12 @@ test.describe('preview-api', () => {
     await expect(sbPage.page.locator('.sidebar-container')).toBeVisible();
 
     // wait for the play function to complete
-    await sbPage.viewAddonPanel('Component tests');
-    const interactionsTab = page.locator('#tabbutton-storybook-test-panel');
+    await sbPage.viewAddonPanel(hasVitestIntegration ? 'Component tests' : 'Interactions');
+    const interactionsTab = page.locator(
+      hasVitestIntegration
+        ? '#tabbutton-storybook-test-panel'
+        : '#tabbutton-storybook-interactions-panel'
+    );
     await expect(interactionsTab).toBeVisible();
     const panel = sbPage.panelContent();
     const runStatusBadge = panel.locator('[aria-label="Status of the test run"]');

code/e2e-tests/util.ts

@@ -2,6 +2,8 @@ import { toId } from '@storybook/csf';
 
 import type { Expect, Page } from '@playwright/test';
 
+import { allTemplates } from '../lib/cli-storybook/src/sandbox-templates';
+
 export class SbPage {
   readonly page: Page;
 
@@ -142,3 +144,9 @@ export class SbPage {
     return this.previewIframe().locator('body');
   }
 }
+
+const templateName: keyof typeof allTemplates = process.env.STORYBOOK_TEMPLATE_NAME || ('' as any);
+
+const templates = allTemplates;
+export const hasVitestIntegration =
+  !templates[templateName]?.skipTasks?.includes('vitest-integration');