more tests

concrete-utopia · Dec 13, 2024 · 7a4717a · 7a4717a
1 parent 0f413af
commit 7a4717a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/...rc/components/canvas/canvas-strategies/strategies/grid-reorder-strategy.spec.browser2.tsx b/...rc/components/canvas/canvas-strategies/strategies/grid-reorder-strategy.spec.browser2.tsx
@@ -430,7 +430,7 @@ export var storyboard = (
           data-testid='blue'
           data-label='blue'
         />
-      </Grid>
+      </div>
     </Scene>
   </Storyboard>
 )

diff --git a/...components/canvas/canvas-strategies/strategies/grid-reparent-strategies.spec.browser2.tsx b/...components/canvas/canvas-strategies/strategies/grid-reparent-strategies.spec.browser2.tsx
@@ -947,6 +947,25 @@ import { Storyboard } from 'utopia-api'
 
 export var storyboard = (
   <Storyboard data-uid='sb' data-testid='sb'>
+    <Grid
+      style={{
+        backgroundColor: '#aaaaaa33',
+        position: 'absolute',
+        left: 100,
+        top: 100,
+        width: 300,
+        height: 300,
+        padding: 10,
+      }}
+      data-uid='grid'
+      data-testid='grid'
+    ${insideGrid == null ? '/>' : `>${insideGrid}</Grid>`}
+    ${extraCode ?? ''}
+  </Storyboard>
+)
+
+export function Grid(props) {
+  return (
     <div
       style={{
         display: 'grid',
@@ -955,13 +974,12 @@ export var storyboard = (
         gridGap: 10,
         ...props.style,
       }}
-      data-uid='grid'
-      data-testid='grid'
+      data-uid='59069a6cd70fcd33ce17f5ff0be43a07'
     >
-    ${insideGrid == null ? '/>' : `>${insideGrid}</Grid>`}
-    ${extraCode ?? ''}
-  </Storyboard>
-)
+      {props.children}
+    </div>
+  )
+}
 `
 }
 

diff --git a/editor/src/components/canvas/canvas-strategies/strategies/grid.test-utils.ts b/editor/src/components/canvas/canvas-strategies/strategies/grid.test-utils.ts
@@ -27,14 +27,8 @@ export async function runGridMoveTest(
   },
   midDragCallback?: (editor: EditorRenderResult) => void,
 ) {
+  await selectComponentsForTest(editor, [EP.fromString(props.gridPath)])
   const elementPathToDrag = EP.appendToPath(EP.fromString(props.gridPath), props.testId)
-
-  await selectComponentsForTest(editor, [elementPathToDrag])
-
-  if (props.scale !== 1) {
-    await editor.dispatch([CanvasActions.zoom(props.scale)], true)
-  }
-
   // trigger the grid controls so we know where to find the cells
   const { sourceGridCell, dragFrom, dragTo } = await getSafeGridMoveTestEndpoints(
     editor,
@@ -46,6 +40,12 @@ export async function runGridMoveTest(
     },
   )
 
+  await selectComponentsForTest(editor, [elementPathToDrag])
+
+  if (props.scale !== 1) {
+    await editor.dispatch([CanvasActions.zoom(props.scale)], true)
+  }
+
   await mouseDownAtPoint(sourceGridCell, dragFrom)
   await mouseMoveToPoint(sourceGridCell, dragTo)
   if (props.tab) {