dragAndDropThought: Hide QuickDrop and Alert at the end, after mouseUp.

cybersemics · Dec 2, 2024 · 4f2eb4d · 4f2eb4d
1 parent c3b8393
commit 4f2eb4d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/...er/__tests__/__image_snapshots__/drag-and-drop/drop-drag-and-drop-thought-1.png b/...er/__tests__/__image_snapshots__/drag-and-drop/drop-drag-and-drop-thought-1.png
diff --git a/src/e2e/puppeteer/helpers/dragAndDropThought.ts b/src/e2e/puppeteer/helpers/dragAndDropThought.ts
@@ -92,29 +92,24 @@ const dragAndDropThought = async (
     await page.mouse.move(dropPosition.x, dropPosition.y)
   }
 
+  await page.locator('[data-testid="quick-drop-panel"]').wait()
+  await page.locator('[data-testid="popup-value"]').wait()
+
+  if (mouseUp) {
+    await page.mouse.up()
+    await waitUntil(() => !document.querySelector('[data-drag-in-progress="true"]'))
+  }
+
   // Hide QuickDropPanel by defafult.
   // Otherwise wait for QuickDropPanel  to appear so that snapshots are consistent.
   if (!showQuickDropPanel) {
     await hide('[data-testid="quick-drop-panel"]')
-  } else {
-    await page.locator('[data-testid="quick-drop-panel"]').wait()
   }
 
   // Hide Alert by default.
   // Otherwise wait for Alert value to appear so that snapshots are consistent.
   if (!showAlert) {
     await hide('[data-testid="alert"]')
-  } else {
-    await page.locator('[data-testid="popup-value"]').wait()
-  }
-
-  if (mouseUp) {
-    await page.mouse.up()
-    await waitUntil(() => !document.querySelector('[data-drag-in-progress="true"]'))
-
-    // TODO: The drop/DragAndDropThought still fails intermittently without a delay here.
-    // When it fails, the drag appears to still be in progress. The bullet is highlighted and the QuickDropPanel is visible (though it should be hidden at this point)
-    await sleep(500)
   }
 }