test $data swapping for all prop types

Author: yyx990803

src/instance/scope.js

@@ -59,13 +59,15 @@ exports._setData = function (newData) {
   var oldData = this._data
   this._data = newData
   var keys, key, i
-  // copy props
+  // copy props.
+  // this should only happen during a v-repeat of component
+  // that also happens to have compiled props.
   var props = this.$options.props
   if (props) {
     i = props.length
     while (i--) {
       key = props[i]
-      if (key !== '$data') {
+      if (key !== '$data' && !newData.hasOwnProperty(key)) {
         newData.$set(key, oldData[key])
       }
     }

test/unit/specs/instance/scope_spec.js

@@ -33,26 +33,86 @@ describe('Instance Scope', function () {
 
   describe('$data', function () {
 
-    var vm = new Vue({
-      props: ['c'],
-      data: {
-        a: 1
-      }
-    })
-
     it('should initialize props', function () {
+      var vm = new Vue({
+        props: ['c'],
+        data: {
+          a: 1
+        }
+      })
       expect(vm.hasOwnProperty('c')).toBe(true)
     })
 
     it('replace $data', function () {
-      vm.c = 3
+      var vm = new Vue({
+        data: {
+          a: 1
+        }
+      })
       vm.$data = { b: 2 }
       // proxy new key
       expect(vm.b).toBe(2)
       // unproxy old key that's no longer present
       expect(vm.hasOwnProperty('a')).toBe(false)
-      // should copy props
+    })
+
+    it('replace $data and handle props', function () {
+      var el = document.createElement('div')
+      var vm = new Vue({
+        el: el,
+        template: '<test a="{{a}}" b="{{*b}}" c="{{<c}}" d="{{>d}}"></test>',
+        data: {
+          a: 1,
+          b: 2,
+          c: 3,
+          d: 0
+        },
+        components: {
+          test: {
+            props: ['a', 'b', 'c', 'd'],
+            data: function () {
+              return {
+                d: 4
+              }
+            }
+          }
+        }
+      })
+      var child = vm._children[0]
+      expect(child.a).toBe(1)
+      expect(child.b).toBe(2)
+      expect(child.c).toBe(3)
+      expect(vm.d).toBe(4)
+      expect(child.d).toBe(4)
+
+      // test new data without prop fields:
+      // should just copy
+      child.$data = {}
+      expect(child.a).toBe(1)
+      expect(child.b).toBe(2)
+      expect(child.c).toBe(3)
+      expect(vm.d).toBe(4)
+      expect(child.d).toBe(4)
+
+      // test new data with value:
+      child.$data = {
+        a: 2, // two-way
+        b: 3, // one-time
+        c: 4, // one-way-down
+        d: 5  // one-way-up
+      }
+      // two-way
+      expect(child.a).toBe(2)
+      expect(vm.a).toBe(2)
+      // one-time
+      expect(child.b).toBe(3)
+      expect(vm.b).toBe(2)
+      // one-way down
+      expect(child.c).toBe(4)
       expect(vm.c).toBe(3)
+      // one-way up
+      expect(vm.d).toBe(5)
+      expect(child.d).toBe(5)
     })
 
   })
@@ -178,4 +238,4 @@ describe('Instance Scope', function () {
 
   })
 
-})
+})