feat(update): run watchers in update

closes #283

Author: eddyerburgh

src/wrappers/vue-wrapper.js

@@ -15,6 +15,9 @@ function update () {
   const vnodes = this._render()
   this._update(vnodes)
   this.$children.forEach(child => update.call(child))
+  this._watchers.forEach(watcher => {
+    watcher.run()
+  })
 }
 
 export default class VueWrapper extends Wrapper implements BaseWrapper {

src/wrappers/wrapper.js

@@ -340,13 +340,6 @@ export default class Wrapper implements BaseWrapper {
       this.vm.$set(this.vm, [key], data[key])
     })
 
-    Object.keys(data).forEach((key) => {
-      // $FlowIgnore : Problem with possibly null this.vm
-      this.vm._watchers.forEach((watcher) => {
-        if (watcher.expression === key) { watcher.run() }
-      })
-    })
-
     this.update()
   }
 
@@ -393,10 +386,6 @@ export default class Wrapper implements BaseWrapper {
           }
         })
       }
-      // $FlowIgnore
-      this.vm._watchers.forEach((watcher) => {
-        if (watcher.expression === key) { watcher.run() }
-      })
     })
     this.update()
   }
@@ -435,12 +424,6 @@ export default class Wrapper implements BaseWrapper {
       }
     })
 
-    Object.keys(data).forEach((key) => {
-      // $FlowIgnore : Problem with possibly null this.vm
-      this.vm._watchers.forEach((watcher) => {
-        if (watcher.expression === key) { watcher.run() }
-      })
-    })
     this.update()
     // $FlowIgnore : Problem with possibly null this.vm
     this.vnode = this.vm._vnode

test/unit/specs/mount/Wrapper/update.spec.js

@@ -38,6 +38,36 @@ describe('update', () => {
     expect(innerEl.hasClass('is-on')).to.equal(true)
   })
 
+  it('runs watchers', () => {
+    const TestComponent = {
+      template: `
+      <div>
+        <input v-model="text" />
+        <button v-if="showButton">Submit</button>
+      </div>
+      `,
+      data () {
+        return {
+          text: '',
+          showButton: false
+        }
+      },
+
+      watch: {
+        text () {
+          this.showButton = true
+        }
+      }
+    }
+    const wrapper = mount(TestComponent)
+
+    wrapper.find('input').element.value = 'Value'
+    wrapper.find('input').trigger('input')
+
+    expect(wrapper.vm.showButton).to.equal(true)
+    expect(wrapper.find('button').exists()).to.equal(true)
+  })
+
   it('causes vm to re render, and retain slots', () => {
     const compiled = compileToFunctions('<div><slot></slot></div>')
     const wrapper = mount(compiled, { slots: { default: [compileToFunctions('<div class="test-div" />')] }})