Skip to content

Commit 02f28e4

Browse files
committed
chore(async_testing): Draggable should waitForDragDelay
1 parent e46ee07 commit 02f28e4

File tree

1 file changed

+22
-26
lines changed

1 file changed

+22
-26
lines changed

src/Draggable/tests/Draggable.test.js

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,11 @@ describe('Draggable', () => {
294294
draggable: 'li',
295295
});
296296
const draggableElement = sandbox.querySelector('li');
297-
document.elementFromPoint = () => draggableElement;
298297

299298
triggerEvent(draggableElement, 'mousedown', {button: 0});
300299

301300
// Wait for delay
302-
jest.runTimersToTime(100);
301+
waitForDragDelay(100);
303302

304303
const containerChildren = newInstance.getDraggableElementsForContainer(draggableElement.parentNode);
305304

@@ -336,7 +335,6 @@ describe('Draggable', () => {
336335
clickMouse(draggableElement);
337336
waitForDragDelay(100);
338337
moveMouse(dynamicContainer);
339-
340338
expect(dragOverContainerHandler).toHaveBeenCalled();
341339

342340
releaseMouse(newInstance.source);
@@ -432,7 +430,7 @@ describe('Draggable', () => {
432430
const draggableElement = document.querySelector('li');
433431

434432
clickMouse(draggableElement);
435-
waitForDragDelay(100);
433+
waitForDragDelay();
436434
waitForRequestAnimationFrame();
437435

438436
expect(dragStartHandler).toHaveBeenCalledTimes(1);
@@ -456,9 +454,8 @@ describe('Draggable', () => {
456454
newInstance.on('drag:start', callback);
457455

458456
triggerEvent(draggableElement, 'mousedown', {button: 0});
459-
460457
// Wait for delay
461-
jest.runTimersToTime(100);
458+
waitForDragDelay(100);
462459

463460
const call = callback.mock.calls[0][0];
464461

@@ -482,7 +479,7 @@ describe('Draggable', () => {
482479
triggerEvent(draggableElement, 'mousedown', {button: 0});
483480

484481
// Wait for delay
485-
jest.runTimersToTime(100);
482+
waitForDragDelay(100);
486483

487484
triggerEvent(draggableElement, 'dragstart', {button: 0});
488485

@@ -515,7 +512,7 @@ describe('Draggable', () => {
515512
triggerEvent(draggableElement, 'mousedown', {button: 0});
516513

517514
// Wait for delay
518-
jest.runTimersToTime(100);
515+
waitForDragDelay(100);
519516

520517
triggerEvent(draggableElement, 'dragstart', {button: 0});
521518

@@ -534,7 +531,7 @@ describe('Draggable', () => {
534531
triggerEvent(draggableElement, 'mousedown', {button: 0});
535532

536533
// Wait for delay
537-
jest.runTimersToTime(100);
534+
waitForDragDelay(100);
538535

539536
const callback = jest.fn();
540537
newInstance.on('drag:move', callback);
@@ -568,7 +565,7 @@ describe('Draggable', () => {
568565
triggerEvent(draggableElement, 'mousedown', {button: 0});
569566

570567
// Wait for delay
571-
jest.runTimersToTime(100);
568+
waitForDragDelay(100);
572569

573570
const callback = jest.fn();
574571
newInstance.on('drag:stop', callback);
@@ -592,7 +589,7 @@ describe('Draggable', () => {
592589
triggerEvent(draggableElement, 'mousedown', {button: 0});
593590

594591
// Wait for delay
595-
jest.runTimersToTime(100);
592+
waitForDragDelay(100);
596593

597594
expect(newInstance.source.classList).toContain('draggable-source--is-dragging');
598595

@@ -609,7 +606,7 @@ describe('Draggable', () => {
609606
triggerEvent(draggableElement, 'mousedown', {button: 0});
610607

611608
// Wait for delay
612-
jest.runTimersToTime(100);
609+
waitForDragDelay(100);
613610

614611
const source = newInstance.source;
615612

@@ -634,7 +631,7 @@ describe('Draggable', () => {
634631
triggerEvent(draggableElement, 'mousedown', {button: 0});
635632

636633
// Wait for delay
637-
jest.runTimersToTime(100);
634+
waitForDragDelay(100);
638635

639636
const source = newInstance.source;
640637

@@ -654,7 +651,7 @@ describe('Draggable', () => {
654651
triggerEvent(draggableElement, 'mousedown', {button: 0});
655652

656653
// Wait for delay
657-
jest.runTimersToTime(100);
654+
waitForDragDelay(100);
658655

659656
expect(document.body.classList).toContain('draggable--is-dragging');
660657

@@ -672,8 +669,7 @@ describe('Draggable', () => {
672669
triggerEvent(draggableElement, 'mousedown', {button: 0});
673670

674671
// Wait for delay
675-
jest.runTimersToTime(100);
676-
672+
waitForDragDelay(100);
677673
expect(document.body.classList).toContain('draggable--is-dragging');
678674

679675
triggerEvent(document.body, 'mouseup', {button: 0});
@@ -695,7 +691,7 @@ describe('Draggable', () => {
695691
triggerEvent(draggableElement, 'mousedown', {button: 0});
696692

697693
// Wait for delay
698-
jest.runTimersToTime(100);
694+
waitForDragDelay(100);
699695

700696
expect(document.body.classList).not.toContain('draggable--is-dragging');
701697

@@ -713,7 +709,7 @@ describe('Draggable', () => {
713709
triggerEvent(draggableElement, 'mousedown', {button: 0});
714710

715711
// Wait for delay
716-
jest.runTimersToTime(100);
712+
waitForDragDelay(100);
717713

718714
triggerEvent(draggableElement, 'mouseup', {button: 0});
719715

@@ -731,7 +727,7 @@ describe('Draggable', () => {
731727
triggerEvent(draggableElement, 'mousedown', {button: 0});
732728

733729
// Wait for delay
734-
jest.runTimersToTime(100);
730+
waitForDragDelay(100);
735731

736732
triggerEvent(document.body, 'mouseup', {button: 0});
737733

@@ -754,7 +750,7 @@ describe('Draggable', () => {
754750
triggerEvent(draggableElement, 'mousedown', {button: 0});
755751

756752
// Wait for delay
757-
jest.runTimersToTime(100);
753+
waitForDragDelay(100);
758754

759755
expect(containers[0].classList).toContain('draggable-container--is-dragging');
760756

@@ -772,7 +768,7 @@ describe('Draggable', () => {
772768
triggerEvent(draggableElement, 'mousedown', {button: 0});
773769

774770
// Wait for delay
775-
jest.runTimersToTime(100);
771+
waitForDragDelay(100);
776772

777773
expect(containers[0].classList).toContain('draggable-container--is-dragging');
778774

@@ -794,7 +790,7 @@ describe('Draggable', () => {
794790
triggerEvent(draggableElement, 'mousedown', {button: 0});
795791

796792
// Wait for delay
797-
jest.runTimersToTime(100);
793+
waitForDragDelay(100);
798794

799795
expect(containers[0].classList).not.toContain('draggable-container--is-dragging');
800796

@@ -811,7 +807,7 @@ describe('Draggable', () => {
811807
triggerEvent(draggableElement, 'mousedown', {button: 0});
812808

813809
// Wait for delay
814-
jest.runTimersToTime(100);
810+
waitForDragDelay(100);
815811

816812
expect(draggableElement.classList.contains(newInstance.getClassNameFor('source:original'))).toBeTruthy();
817813

@@ -839,21 +835,21 @@ describe('Draggable', () => {
839835
triggerEvent(draggableElement, 'mousedown', {button: 0});
840836

841837
// Wait for delay
842-
jest.runTimersToTime(100);
838+
waitForDragDelay(100);
843839

844840
expect(newInstance.isDragging()).toBe(true);
845841

846842
document.elementFromPoint = () => draggableElement.nextElementSibling;
847843
triggerEvent(draggableElement.nextElementSibling, 'mousemove', {button: 0});
848844

849845
// Wait for delay
850-
jest.runTimersToTime(100);
846+
waitForDragDelay(100);
851847

852848
document.elementFromPoint = () => document.body;
853849
triggerEvent(document.body, 'mousemove', {button: 0});
854850

855851
// Wait for delay
856-
jest.runTimersToTime(100);
852+
waitForDragDelay(100);
857853

858854
triggerEvent(document.body, 'mouseup', {button: 0});
859855
});

0 commit comments

Comments
 (0)