attempt to fix e2e

pull/5370/head
Joseph Izang 1 year ago
parent 397bd8a01b
commit 55d186748f
  1. 5
      apps/remix-ide-e2e/src/tests/file_explorer_dragdrop.test.ts
  2. 2
      libs/remix-ui/workspace/src/lib/components/flat-tree-drop.tsx
  3. 3
      libs/remix-ui/workspace/src/lib/components/flat-tree.tsx

@ -54,9 +54,12 @@ module.exports = {
const id = (el as any).value.getId() const id = (el as any).value.getId()
browser browser
.waitForElementVisible('li[data-id="treeViewLitreeViewItemscripts"]') .waitForElementVisible('li[data-id="treeViewLitreeViewItemscripts"]')
.dragAndDrop('li[data-id="treeViewLitreeViewItemscripts"]', id) .dragAndDrop('div[data-id="treeViewDivDraggableItemscripts"]', id)
.pause()
.waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
.pause()
.execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() }) .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
.pause()
.waitForElementVisible('li[data-id="treeViewLitreeViewItemcontracts/scripts"]') .waitForElementVisible('li[data-id="treeViewLitreeViewItemcontracts/scripts"]')
}) })
} }

@ -61,7 +61,7 @@ export const FlatTreeDrop = (props: FlatTreeDropProps) => {
} else { } else {
dragDestination = getFlatTreeItem(target.path) dragDestination = getFlatTreeItem(target.path)
} }
console.log(dragDestination)
if (dragDestination.isDirectory) { if (dragDestination.isDirectory) {
if (dragSource.isDirectory) { if (dragSource.isDirectory) {
moveFolder(dragDestination.path, dragSource.path) moveFolder(dragDestination.path, dragSource.path)

@ -186,7 +186,7 @@ export const FlatTree = (props: FlatTreeProps) => {
}, [focusEdit]) }, [focusEdit])
const showIcons = (file: FileType) => const showIcons = (file: FileType) =>
file.path === hover ? ( file.path === hover && !isDragging ? (
<div> <div>
<FileHoverIcons <FileHoverIcons
file={file} file={file}
@ -224,6 +224,7 @@ export const FlatTree = (props: FlatTreeProps) => {
editModeOff={editModeOff} editModeOff={editModeOff}
file={file} /> : file={file} /> :
<><div <><div
data-id={`treeViewDivDraggableItem${file.path}`}
draggable={true} draggable={true}
onDragStart={onDragStart} onDragStart={onDragStart}
onDragEnd={onDragEnd} onDragEnd={onDragEnd}

Loading…
Cancel
Save