Merge branch 'main' into expand-warnings-logs

uselagoon · Mar 1, 2024 · 4da5851 · 4da5851
2 parents 9fb7eda + 33fb8ad
commit 4da5851
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ui-workflow.yaml b/.github/workflows/ui-workflow.yaml
@@ -72,7 +72,6 @@ jobs:
         auto-cancel-after-failures: 1
         wait-on: 'http://localhost:3000'
         command: yarn cypress:runRbac
-      continue-on-error: true
 
     - name: Run General Cypress Tests
       uses: cypress-io/github-action@v6
@@ -81,7 +80,6 @@ jobs:
         auto-cancel-after-failures: 1
         wait-on: 'http://localhost:3000'
         command: yarn cypress:runGeneral
-      continue-on-error: true
 
     - name: Run Organization Cypress Tests
       uses: cypress-io/github-action@v6
@@ -90,7 +88,6 @@ jobs:
         auto-cancel-after-failures: 1
         wait-on: 'http://localhost:3000'
         command: yarn cypress:runOrganizations
-      continue-on-error: true
 
     - name: Stop Docker containers
       run: |

diff --git a/src/components/Accordion/index.stories.tsx b/src/components/Accordion/index.stories.tsx
@@ -1,6 +1,6 @@
 import { expect } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
-import { userEvent, within } from '@storybook/testing-library';
+import { userEvent, waitFor, within } from '@storybook/testing-library';
 
 import Accordion from './index';
 
@@ -51,6 +51,9 @@ export const WithChildren: Story = {
     ),
   },
   play: async ({ canvasElement }) => {
+    // wait for sb root to render;
+    await waitFor(() => within(canvasElement).getByTestId('storybook-accordion'));
+
     // toggle functionality
     const canvas = within(canvasElement);
     const element = await Promise.resolve(canvas.getByTestId('storybook-accordion'));