Merge 4c374de into 490c8c1

Author: KaustubhDamania

integration/test/ParseObjectTest.js

@@ -304,10 +304,7 @@ describe('Parse Object', () => {
     });
 
     obj.increment('objectField.number', 15);
-    assert.deepStrictEqual(obj.attributes.objectField, {
-      number: 20,
-      letter: 'a',
-    });
+    await obj.save();
     assert.deepStrictEqual(obj.attributes.objectField, {
       number: 20,
       letter: 'a',
@@ -381,7 +378,7 @@ describe('Parse Object', () => {
     } catch (error) {
       assert.equal(
         error.message,
-        'schema mismatch for TestObject.hello; expected String but got Object'
+        `Cannot create property 'dot' on string 'world'`
       );
     }
   });

src/ObjectStateMutations.js

@@ -135,7 +135,8 @@ export function estimateAttributes(
           const fields = attr.split('.');
           const first = fields[0];
           const last = fields[fields.length - 1];
-          data[first] = { ...serverData[first] };
+          // data[first] = { ...serverData[first] };
+          data[first] = (serverData[first] === undefined) ? {} : serverData[first];
           let object = { ...data };
           for (let i = 0; i < fields.length - 1; i++) {
             const key = fields[i];

src/__tests__/ObjectStateMutations-test.js

@@ -195,6 +195,77 @@ describe('ObjectStateMutations', () => {
         },
       },
     });
+    serverData = {
+      _id: 'someId',
+      items: [
+        {
+          value: 'a',
+          count: 5
+        },
+        {
+          value: 'b',
+          count: 1
+        }
+      ],
+      className: 'bug',
+      number: 2
+    }
+    pendingOps = [{ 'items.0.count': new ParseOps.IncrementOp(1) }];
+    expect(
+      ObjectStateMutations.estimateAttributes(serverData, pendingOps, 'someClass', 'someId')
+    ).toEqual({
+      _id: 'someId',
+      items: [
+        {
+          value: 'a',
+          count: 6
+        },
+        {
+          value: 'b',
+          count: 1
+        }
+      ],
+      className: 'bug',
+      number: 2
+    });
+
+    serverData = {
+      _id: 'someId',
+      items: [
+        {
+          value: {
+            count: 54
+          },
+          count: 5
+        },
+        {
+          value: 'b',
+          count: 1
+        }
+      ],
+      className: 'bug',
+      number: 2
+    }
+    pendingOps = [{ 'items.0.value.count': new ParseOps.IncrementOp(6) }];
+    expect(
+      ObjectStateMutations.estimateAttributes(serverData, pendingOps, 'someClass', 'someId')
+    ).toEqual({
+      _id: 'someId',
+      items: [
+        {
+          value: {
+            count: 60
+          },
+          count: 5
+        },
+        {
+          value: 'b',
+          count: 1
+        }
+      ],
+      className: 'bug',
+      number: 2
+    })
   });
 
   it('can commit changes from the server', () => {

src/__tests__/ParseObject-test.js

@@ -590,6 +590,16 @@ describe('ParseObject', () => {
     expect(o2.attributes).toEqual({ age: 40 });
     o2.increment('age');
     expect(o2.attributes).toEqual({ age: 41 });
+
+    const obj = ParseObject.fromJSON({
+      _id: 'someId',
+      items: [ { value: 'a', count: 5 }, { value: 'b', count: 1 } ],
+      className: 'bug'
+    })
+    obj.increment('items.0.count')
+    expect(obj.get('items')).toEqual([
+      { value: 'a', count: 6 }, { value: 'b', count: 1 }
+    ])
   });
 
   it('can decrement a field', () => {