Merge branch 'develop' into controlledRerender

Program-AR · Jun 28, 2024 · 414272c · 414272c
2 parents a42aa93 + bc826a4
commit 414272c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/components/blockly/PBBlocklyWorkspace.tsx b/src/components/blockly/PBBlocklyWorkspace.tsx
@@ -38,7 +38,7 @@ export const PBBlocklyWorkspace = ({ blockIds, categorized, sx, title, ...props
   return (
     <PBCard sx={{ ...sx }}>
       {title && <Typography>{t('preview')}</Typography>}
-      <Box width="100%" height="100%" ref={setBlocklyContainer} className="blockly" />
+      <Box width="100%" height="100%" ref={setBlocklyContainer} data-testid='pb-blockly' className="blockly" />
     </PBCard>
   )
 }

diff --git a/src/components/blockly/blockly.ts b/src/components/blockly/blockly.ts
@@ -1483,5 +1483,6 @@ export const setXml = (xml: string ) => {
 
 export const setupBlockly = (container: Element, workspaceConfiguration: Blockly.BlocklyOptions) => {
   container.replaceChildren() //Removes previous injection, otherwise it might keep inserting below the current workspace
+  container.ariaValueText = 'child-blockly'
   Blockly.inject(container, workspaceConfiguration)
 }
diff --git a/src/test/Creator/ToolboxPreview.test.tsx b/src/test/Creator/ToolboxPreview.test.tsx
@@ -4,14 +4,12 @@ import { ToolboxPreview } from '../../components/creator/Editor/ChallengeDetails
 import { commonBlocks, sceneBlocks } from '../../components/blockly/blocks';
 
 describe('Toolbox Preview', () => {
-    test.skip('rendering toolbox preview ', async () => {
+  test('rendering toolbox preview ', async () => {
+    const toolBoxItems = [...commonBlocks.map((block => block.id)), ...sceneBlocks.map((block => block.id))]
+    renderComponent(<ToolboxPreview blockIds={toolBoxItems} categorized={false} />);
+    const idPBBlockly = await screen.findByTestId('pb-blockly')
+    expect(idPBBlockly).toBeInTheDocument()
+    expect(idPBBlockly.firstChild).toHaveClass('injectionDiv')
+  });
 
-      const toolBoxItems = [...commonBlocks.map((block => block.id)), ...sceneBlocks.map((block => block.id))]
-
-      renderComponent(<ToolboxPreview blockIds={toolBoxItems} categorized={false}/>)
-
-      const blocks = await screen.findByTestId(toolBoxItems.join(","))      
-
-      expect(blocks).toBeInTheDocument()
-    })
 })