test: update Controller tests and remove getTestHelpers function

Author: aleclarson

packages/core/src/Controller.test.ts

@@ -36,22 +36,24 @@ describe('Controller', () => {
   describe('when the "to" prop is an async function', () => {
     it('acts strangely without the "from" prop', async () => {
       const ctrl = new Controller<{ x: number }>()
+
+      const { springs } = ctrl
       ctrl.start({
         to: async update => {
           // The spring does not exist yet!
-          expect(ctrl.get('x')).toBeUndefined()
+          expect(springs.x).toBeUndefined()
 
           // Any values passed here are treated as "from" values,
           // because no "from" prop was ever given.
           update({ x: 1 })
           // Now the spring exists!
-          expect(ctrl.get('x')).toBeDefined()
+          expect(springs.x).toBeDefined()
           // But the spring is idle!
-          expect(ctrl.get('x').idle).toBeTruthy()
+          expect(springs.x.idle).toBeTruthy()
 
           // This call *will* start an animation!
           update({ x: 2 })
-          expect(ctrl.get('x').idle).toBeFalsy()
+          expect(springs.x.idle).toBeFalsy()
         },
       })
 

packages/core/test/setup.ts

@@ -54,74 +54,33 @@ global.advanceUntilValue = (spring, value) => {
   })
 }
 
-global.getFrames = (arg: SpringValue | Controller) => {
-  const { frames, testIdle, reset } = getTestHelpers(arg)
-  // expect(spring.animation.values).not.toEqual([])
+global.getFrames = (ctrl: SpringValue | Controller) => {
+  const frames: any[] = []
 
   let steps = 0
-  while (!testIdle()) {
+  while (!ctrl.idle) {
     mockRaf.step()
+    frames.push(ctrl.get())
     if (++steps > 1e5) {
       throw Error('Infinite loop detected')
     }
   }
 
-  reset()
   return frames
 }
 
 global.getAsyncFrames = async ctrl => {
-  const { frames, testIdle, reset } = getTestHelpers(ctrl)
+  const frames: any[] = []
 
   let steps = 0
-  while (!testIdle()) {
+  while (!ctrl.idle) {
     mockRaf.step()
+    frames.push(ctrl.get())
     await Promise.resolve()
     if (++steps > 1e5) {
       throw Error('Infinite loop detected')
     }
   }
 
-  reset()
   return frames
 }
-
-function getTestHelpers(arg: Controller<any> | SpringValue<any>) {
-  const frames: any[] = []
-
-  const ctrl = arg instanceof Controller ? arg : null
-  if (ctrl) {
-    const { onFrame } = ctrl['_state']
-    ctrl['_state'].onFrame = (frame: any) => {
-      frames.push(frame)
-      if (onFrame) onFrame(frame)
-    }
-    return {
-      frames,
-      testIdle: () =>
-        !ctrl['_state'].promise &&
-        Object.values(ctrl.springs).every(spring => spring!.idle),
-      reset() {
-        ctrl['_state'].onFrame = onFrame
-      },
-    }
-  }
-
-  const spring = arg instanceof SpringValue ? arg : null
-  if (spring) {
-    const onChange = spring['_onChange']
-    spring['_onChange'] = (value, idle) => {
-      frames.push(value)
-      onChange.call(spring, value, idle)
-    }
-    return {
-      frames,
-      testIdle: () => spring.idle && !spring['_state'].promise,
-      reset() {
-        spring['_onChange'] = onChange
-      },
-    }
-  }
-
-  throw Error('Invalid argument')
-}