Update Jest (#20)

Author: okwolf

.gitignore

@@ -1,3 +1,5 @@
 coverage/
 node_modules/
-dist/
+dist/
+yarn-error.log
+yarn.lock

package.json

@@ -16,7 +16,7 @@
     "eslint": "^4.18.2",
     "eslint-plugin-compat": "^2.2.0",
     "hyperapp": "^1.1.2",
-    "jest": "^21.2.1",
+    "jest": "^22.4.2",
     "prettier": "^1.8.2",
     "rollup": "^0.55.5",
     "uglify-js": "^3.2.1"

src/withFx.js

@@ -85,13 +85,11 @@ function patchVdomFx(actions, vdom, fx) {
 function makeFxApp(fx, nextApp) {
   return function(initialState, actionsTemplate, view, container) {
     var enhancedActions = enhanceActions(actionsTemplate, fx)
-    var enhancedView = isFn(view)
-      ? function(state, actions) {
-          var vdom = view(state, actions)
-          patchVdomFx(actions, vdom, fx)
-          return vdom
-        }
-      : undefined
+    var enhancedView = function(state, actions) {
+      var vdom = view(state, actions)
+      patchVdomFx(actions, vdom, fx)
+      return vdom
+    }
 
     var appActions = nextApp(
       initialState,

test/withFx.test.js

@@ -15,6 +15,10 @@ import {
   throttle
 } from "../src"
 
+beforeEach(() => {
+  document.body.innerHTML = ""
+})
+
 describe("withFx", () => {
   it("should be a function", () => expect(withFx).toBeInstanceOf(Function))
   it("should call view without actions", done =>
@@ -35,7 +39,8 @@ describe("withFx", () => {
         exit: () => {
           done()
         }
-      }
+      },
+      Function.prototype
     )
 
     expect(main.get()).toEqual({
@@ -71,7 +76,8 @@ describe("withFx", () => {
             {},
             {
               foo: () => action("unknown")
-            }
+            },
+            Function.prototype
           ).foo()
         ).toThrow("couldn't find action: unknown"))
       it("should throw for unknown slice actions", () =>
@@ -80,7 +86,8 @@ describe("withFx", () => {
             {},
             {
               foo: () => action("uh.oh")
-            }
+            },
+            Function.prototype
           ).foo()
         ).toThrow("couldn't find action: uh.oh"))
       it("should fire a chained action", done =>
@@ -92,7 +99,8 @@ describe("withFx", () => {
               expect(data).toEqual({ some: "data" })
               done()
             }
-          }
+          },
+          Function.prototype
         ).foo())
       it("should fire a slice action", done =>
         withFx(app)(
@@ -105,7 +113,8 @@ describe("withFx", () => {
                 done()
               }
             }
-          }
+          },
+          Function.prototype
         ).foo())
       it("should update state", done =>
         withFx(app)(
@@ -132,10 +141,10 @@ describe("withFx", () => {
               expect(data).toEqual({ moar: "stuff" })
               done()
             }
-          }
+          },
+          Function.prototype
         ).foo())
       it("should attach to listeners in view", done => {
-        document.body.innerHTML = ""
         withFx(app)(
           {
             message: "hello"
@@ -182,7 +191,8 @@ describe("withFx", () => {
                 done()
               }
             }
-          }
+          },
+          Function.prototype
         )
         main.foo()
         expect(requestAnimationFrame).toBeCalledWith(expect.any(Function))
@@ -216,9 +226,7 @@ describe("withFx", () => {
     describe("time", () => {
       it("should get the current time", done => {
         const timestamp = 9001
-        global.performance = {
-          now: () => timestamp
-        }
+        global.performance.now = () => timestamp
         withFx(app)(
           {},
           {
@@ -229,9 +237,10 @@ describe("withFx", () => {
                 done()
               }
             }
-          }
+          },
+          Function.prototype
         ).foo()
-        delete global.performance
+        delete global.performance.now
       })
     })
     /* eslint-disable no-console */
@@ -247,7 +256,8 @@ describe("withFx", () => {
           {},
           {
             foo: () => log(...testArgs)
-          }
+          },
+          Function.prototype
         ).foo()
         console.log = defaultLog
       })
@@ -276,7 +286,8 @@ describe("withFx", () => {
                 done()
               }
             }
-          }
+          },
+          Function.prototype
         ).foo()
         delete global.fetch
       })
@@ -300,7 +311,8 @@ describe("withFx", () => {
                 done()
               }
             }
-          }
+          },
+          Function.prototype
         ).foo()
         delete global.fetch
       })
@@ -334,7 +346,8 @@ describe("withFx", () => {
                 done()
               }
             }
-          }
+          },
+          Function.prototype
         ).foo()
         delete global.fetch
       })
@@ -365,7 +378,8 @@ describe("withFx", () => {
                 done.fail(new Error("Should not be called"))
               }
             }
-          }
+          },
+          Function.prototype
         ).foo()
         delete global.fetch
       })
@@ -388,7 +402,8 @@ describe("withFx", () => {
                 done()
               }
             }
-          }
+          },
+          Function.prototype
         ).foo()
         delete global.fetch
       })
@@ -413,14 +428,14 @@ describe("withFx", () => {
                 done()
               }
             }
-          }
+          },
+          Function.prototype
         ).foo()
         delete global.fetch
       })
     })
     describe("event", () => {
       it("should attach to listeners in view", done => {
-        document.body.innerHTML = ""
         withFx(app)(
           {
             message: "hello"
@@ -464,7 +479,8 @@ describe("withFx", () => {
               expect(data).toEqual(keyEvent)
               done()
             }
-          }
+          },
+          Function.prototype
         ).init()
         document.onkeydown(keyEvent)
       })
@@ -480,7 +496,8 @@ describe("withFx", () => {
               expect(data).toEqual(keyEvent)
               done()
             }
-          }
+          },
+          Function.prototype
         ).init()
         document.onkeyup(keyEvent)
       })
@@ -499,7 +516,8 @@ describe("withFx", () => {
               expect(data).toBeCloseTo(randomValue)
               done()
             }
-          }
+          },
+          Function.prototype
         ).foo()
 
         Math.random = defaultRandom
@@ -517,7 +535,8 @@ describe("withFx", () => {
               expect(data).toBeCloseTo(3.5)
               done()
             }
-          }
+          },
+          Function.prototype
         ).foo()
 
         Math.random = defaultRandom
@@ -646,7 +665,6 @@ describe("withFx", () => {
     })
   })
   it("should allow combining action and event fx in view", done => {
-    document.body.innerHTML = ""
     withFx(app)(
       {
         message: "hello"
@@ -699,7 +717,8 @@ describe("withFx", () => {
         foo: () => ["set", { action: "set" }],
         set: state => state,
         get: () => state => state
-      }
+      },
+      Function.prototype
     )
 
     expect(main.get()).toEqual({
@@ -734,7 +753,8 @@ describe("withFx", () => {
             "expected bar not to be called with overridden action effect!"
           )
         }
-      }
+      },
+      Function.prototype
     ).foo()
 
     expect(actionLog).toEqual([