fixing middleware tests

src/state/create-store.js

@@ -45,7 +45,7 @@ export default ({
       // debugging timer
       // require('./debug-middleware/timing-middleware').default,
       // average action timer
-      require('./debug-middleware/timing-average-middleware').default(50),
+      require('./debug-middleware/timing-average-middleware').default(500),
 
       // ## Application middleware
 

src/state/get-drag-impact/index.js

@@ -45,8 +45,6 @@ export default ({
     previousDroppableOverId,
   });
 
-  console.log('destinationId', destinationId);
-
   // not dragging over anything
   if (!destinationId) {
     return noImpact;

src/state/middleware/drop.js

@@ -4,7 +4,6 @@ import type { Position } from 'css-box-model';
 import {
   dropPending,
   completeDrop,
-  clean,
   animateDrop,
 } from '../action-creators';
 import noImpact from '../no-impact';
@@ -55,10 +54,9 @@ export default ({ getState, dispatch }: Store) =>
     }
 
     // Still waiting for our drop pending to end
-    if (state.phase === 'DROP_PENDING' && state.isWaiting) {
-      console.error('A drop action occurred while DROP_PENDING and still waiting');
-      return;
-    }
+    // TODO: should this throw?
+    const isWaitingForDrop: boolean = state.phase === 'DROP_PENDING' && state.isWaiting;
+    invariant(!isWaitingForDrop, 'A DROP action occurred while DROP_PENDING and still waiting');
 
     invariant(
       state.phase === 'DRAGGING' || state.phase === 'DROP_PENDING',

src/state/middleware/hooks.js

@@ -147,12 +147,6 @@ export default (getHooks: () => Hooks, announce: Announce) => {
     const move = (critical: Critical, location: ?DraggableLocation) => {
       invariant(isDragStartPublished && lastCritical, 'Cannot fire onDragMove when onDragStart has not been called');
 
-      console.log('potential move fired');
-      console.log('location: ', location);
-      console.log('lastLocation', lastLocation);
-      console.log('is critical equal', isCriticalEqual(critical, lastCritical));
-      console.log('areLocationsEqual', areLocationsEqual(lastLocation, location));
-
       // No change to publish
       if (isCriticalEqual(critical, lastCritical) &&
         areLocationsEqual(lastLocation, location)) {

src/state/middleware/lift.js

@@ -60,7 +60,8 @@ export default (getMarshal: () => DimensionMarshal) => {
       dispatch(prepare());
 
       timeoutId = setTimeout(() => {
-      // Phase 2: collect initial dimensions
+        timeoutId = null;
+        // Phase 2: collect initial dimensions
         const state: State = getState();
         invariant(state.phase === 'PREPARING', 'Invalid phase for completing lift');
 

test/unit/state/middleware/drop.spec.js

@@ -102,7 +102,7 @@ it('should dispatch a DROP_PENDING action if BULK_COLLECTING', () => {
   expect(store.getState().phase).toBe('DROP_PENDING');
 });
 
-it('should not do anything if a drop action is fired and there is DROP_PENDING and it is waiting for a publish', () => {
+it.only('should throw if a drop action is fired and there is DROP_PENDING and it is waiting for a publish', () => {
   const mock = jest.fn();
   const passThrough = () => next => (action) => {
     mock(action);
@@ -131,10 +131,8 @@ it('should not do anything if a drop action is fired and there is DROP_PENDING a
 
   // Drop action being fired (should not happen?)
 
-  mock.mockReset();
-  store.dispatch(drop({ reason: 'DROP' }));
-  expect(mock).toHaveBeenCalledTimes(1);
-  expect(mock).toHaveBeenCalledWith(drop({ reason: 'DROP' }));
+  expect(() => store.dispatch(drop({ reason: 'DROP' })))
+    .toThrow('A DROP action occurred while DROP_PENDING and still waiting');
 });
 
 describe('no drop animation required', () => {
@@ -179,8 +177,7 @@ describe('no drop animation required', () => {
         };
         expect(mock).toHaveBeenCalledWith(drop({ reason }));
         expect(mock).toHaveBeenCalledWith(completeDrop(result));
-        expect(mock).toHaveBeenCalledWith(clean());
-        expect(mock).toHaveBeenCalledTimes(3);
+        expect(mock).toHaveBeenCalledTimes(2);
 
         // reset to initial phase
         expect(store.getState().phase).toBe('IDLE');
@@ -496,14 +493,14 @@ describe('drop animation required', () => {
           movement: {
             displaced: [],
             amount: patch(axis.line, preset.inHome1.client.marginBox[axis.size]),
-            isBeyondStartPosition: false,
+            isBeyondStartPosition: true,
           },
           direction: preset.home.axis.direction,
-          destination: getHomeLocation(initialPublishArgs.critical),
+          destination: getHomeLocation(),
         },
         result: {
           ...getDragStart(),
-          destination: getHomeLocation(initialPublishArgs.critical),
+          destination: getHomeLocation(),
           reason: 'DROP',
         },
       };

test/unit/state/middleware/hooks.spec.js

@@ -12,7 +12,7 @@ import {
   moveDown,
   move,
   bulkCollectionStarting,
-  type MoveArgs,
+  type MoveArgs, animateDrop,
 } from '../../../../src/state/action-creators';
 import createStore from './util/create-store';
 import { viewport, initialPublishArgs, initialBulkReplaceArgs, getDragStart } from '../../../utils/preset-action-args';
@@ -381,10 +381,6 @@ describe('abort', () => {
   });
 });
 
-describe('drop flushing', () => {
-  throw new Error('TODO');
-});
-
 describe('subsequent drags', () => {
   it('should behave correctly across multiple drags', () => {
     const hooks: Hooks = createHooks();

test/unit/state/middleware/lift.spec.js

@@ -5,6 +5,7 @@ import type { DimensionMarshal, Callbacks } from '../../../../src/state/dimensio
 import middleware from '../../../../src/state/middleware/lift';
 import createStore from './util/create-store';
 import passThrough from './util/pass-through-middleware';
+import { setViewport, resetViewport } from '../../../utils/viewport';
 import {
   prepare,
   lift,
@@ -18,6 +19,7 @@ import {
   updateDroppableIsEnabled,
 } from '../../../../src/state/action-creators';
 import {
+  viewport,
   liftArgs,
   initialPublishArgs,
   initialBulkReplaceArgs,
@@ -41,10 +43,12 @@ const getMarshal = (store: Store): DimensionMarshal => {
 };
 
 beforeEach(() => {
+  setViewport(viewport);
   jest.useFakeTimers();
 });
 
 afterEach(() => {
+  resetViewport();
   jest.clearAllTimers();
   jest.useRealTimers();
 });

test/unit/state/middleware/pending-drop.spec.js

@@ -36,8 +36,7 @@ it('should trigger a drop on a bulk replace if a drop pending is waiting', () =>
     reason: 'DROP',
   };
   expect(mock).toHaveBeenCalledWith(completeDrop(result));
-  expect(mock).toHaveBeenCalledWith(clean());
-  expect(mock).toHaveBeenCalledTimes(4);
+  expect(mock).toHaveBeenCalledTimes(3);
   expect(store.getState().phase).toBe('IDLE');
 });