feat(option): ignores an empty return

vuejs · Dec 4, 2017 · ecb3ae4 · ecb3ae4
1 parent 6989fb5
commit ecb3ae4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -153,10 +153,10 @@ function install (Vue, options) {
       const { firestore } = this.$options
       this._firestoreUnbinds = Object.create(null)
       this.$firestoreRefs = Object.create(null)
-      if (!firestore) return
       const options = typeof firestore === 'function'
-        ? firestore.call(this, this)
+        ? firestore.call(this)
         : firestore
+      if (!options) return
       Object.keys(options).forEach(key => {
         this.$bind(key, options[key])
       })

diff --git a/test/merging.spec.js b/test/merging.spec.js
@@ -66,3 +66,13 @@ test('should merge two functions', () => {
     c: db.collection(6)
   })
 })
+
+test('ignores no return', () => {
+  const spy = Vue.config.errorHandler = jest.fn()
+  new Vue({
+    firestore: _ => {},
+    render: h => h('p', 'foo')
+  })
+  expect(spy).not.toHaveBeenCalled()
+  spy.mockRestore()
+})