Always merge pending ops on failure

Author: andrewimm

src/ParseObject.js

@@ -353,10 +353,7 @@ export default class ParseObject {
 
   _handleSaveError() {
     var pending = this._getPendingOps();
-    if (pending.length > 2) {
-      // There are more saves on the queue
-      ObjectState.mergeFirstPendingState(this.className, this._getStateIdentifier());
-    }
+    ObjectState.mergeFirstPendingState(this.className, this._getStateIdentifier());
   }
 
   /** Public methods **/

src/__tests__/ParseObject-test.js

@@ -868,7 +868,7 @@ describe('ParseObject', () => {
     p.save().then(null, (err) => {
       expect(err.code).toBe(103);
       expect(err.message).toBe('Invalid class name');
-      expect(p._getPendingOps().length).toBe(2);
+      expect(p._getPendingOps().length).toBe(1);
       expect(p.dirtyKeys()).toEqual(['updates']);
       expect(p.get('updates')).toBe(1);