Repository: parse-community/Parse-SDK-JS
Pull request #405 (2017-01-26 21:22:45)

ParseLiveQuery controller should wrap all subscription events
When you call `subscribe()` on a query (which goes through the ParseLiveQuery controller), the resulting subscription does not currently receive `close` or `error` events for the underlying connection. This was occurring because the LiveQueryController is wrapping the underlying subscriptions, and was not forwarding the `close` or `error` events.

This pull request correctly wraps these two event types so that subscriptions receive all the event notifications they are supposed to, and introduces a new test case to check that all subscription events are forwarded correctly.


Patch:
diff --git a/.travis.yml b/.travis.yml
index d803bc0..f6bee33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,6 @@ language: node_js
 node_js:
 - '5'
 
-branches:
-  only:
-    - master
-
 env:
   - CXX=g++-4.8
 
diff --git a/LICENSE b/LICENSE
index 6ab9a0a..5c19751 100644
--- a/LICENSE
+++ b/LICENSE
@@ -27,4 +27,8 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-----
+
+As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. 
diff --git a/PATENTS b/PATENTS
index 520556d..45e1681 100644
--- a/PATENTS
+++ b/PATENTS
@@ -30,4 +30,8 @@ necessarily infringed by the Software standing alone.
 
 A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
 or contributory infringement or inducement to infringe any patent, including a
-cross-claim or counterclaim.
\ No newline at end of file
+cross-claim or counterclaim.
+
+-----
+
+As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. 
diff --git a/README.md b/README.md
index 9019029..268dd44 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![Npm Version][npm-svg]][npm-link]
 [![License][license-svg]][license-link]
 
-A library that gives you access to the powerful Parse cloud platform from your JavaScript app. For more information on Parse and its features, see [the website](https://parse.com) or [the JavaScript guide](https://parseplatform.github.io/docs/js/guide/).
+A library that gives you access to the powerful Parse cloud platform from your JavaScript app. For more information on Parse and its features, see [the website](http://parseplatform.org) or [the JavaScript guide](https://docs.parseplatform.org/js/guide/).
 
 ## Getting Started
 
@@ -34,6 +34,8 @@ For React Native applications, include `'parse/react-native'`:
 var Parse = require('parse/react-native');
 ```
 
+> As of `v1.9.3`, Parse-SDK-JS supports React Native 0.43+. Please use `v1.9.2` for previous versions of React Native.
+
 ## License
 
 ```
@@ -41,15 +43,17 @@ Copyright (c) 2015-present, Parse, LLC.
 All rights reserved.
 
 This source code is licensed under the BSD-style license found in the
-LICENSE file in the root directory of this source tree. An additional grant 
+LICENSE file in the root directory of this source tree. An additional grant
 of patent rights can be found in the PATENTS file in the same directory.
 ```
 
- [build-status-svg]: https://travis-ci.org/ParsePlatform/Parse-SDK-JS.svg?branch=master
- [build-status-link]: https://travis-ci.org/ParsePlatform/Parse-SDK-JS
- [coverage-status-svg]: http://codecov.io/github/ParsePlatform/Parse-SDK-JS/coverage.svg?branch=master
- [coverage-status-link]: http://codecov.io/github/ParsePlatform/Parse-SDK-JS?branch=master
+As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code.
+
+ [build-status-svg]: https://travis-ci.org/parse-community/Parse-SDK-JS.svg?branch=master
+ [build-status-link]: https://travis-ci.org/parse-community/Parse-SDK-JS
+ [coverage-status-svg]: http://codecov.io/github/parse-community/Parse-SDK-JS/coverage.svg?branch=master
+ [coverage-status-link]: http://codecov.io/github/parse-community/Parse-SDK-JS?branch=master
  [npm-svg]: https://badge.fury.io/js/parse.svg
  [npm-link]: https://npmjs.org/parse
  [license-svg]: https://img.shields.io/badge/license-BSD-lightgrey.svg
- [license-link]: https://github.com/ParsePlatform/Parse-SDK-JS/blob/master/LICENSE
+ [license-link]: https://github.com/parse-community/Parse-SDK-JS/blob/master/LICENSE
diff --git a/integration/package.json b/integration/package.json
index eea9d26..beb951d 100644
--- a/integration/package.json
+++ b/integration/package.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "express": "^4.13.4",
     "mocha": "^2.4.5",
-    "parse-server": "2.2.17"
+    "parse-server": "2.4.2"
   },
   "scripts": {
     "test": "mocha --reporter dot -t 5000"
diff --git a/src/ParseError.js b/src/ParseError.js
index 2a651c2..ebfe1de 100644
--- a/src/ParseError.js
+++ b/src/ParseError.js
@@ -19,6 +19,10 @@ export default class ParseError {
     this.code = code;
     this.message = message;
   }
+  
+  toString() {
+    return 'ParseError: ' + this.code + ' ' + this.message;
+  }
 }
 
 /**
diff --git a/src/ParseLiveQuery.js b/src/ParseLiveQuery.js
index 08ecb8a..3642c14 100644
--- a/src/ParseLiveQuery.js
+++ b/src/ParseLiveQuery.js
@@ -196,6 +196,12 @@ const DefaultLiveQueryController = {
         subscription.on('delete', (object) => {
           subscriptionWrap.emit('delete', object);
         });
+        subscription.on('close', (object) => {
+          subscriptionWrap.emit('close', object);
+        });
+        subscription.on('error', (object) => {
+          subscriptionWrap.emit('error', object);
+        });
 
         this.resolve();
       });
diff --git a/src/ParseQuery.js b/src/ParseQuery.js
index 9904cd2..78c1488 100644
--- a/src/ParseQuery.js
+++ b/src/ParseQuery.js
@@ -44,6 +44,70 @@ function quote(s: string) {
   return '\\Q' + s.replace('\\E', '\\E\\\\E\\Q') + '\\E';
 }
 
+/**
+ * Handles pre-populating the result data of a query with select fields,
+ * making sure that the data object contains keys for all objects that have
+ * been requested with a select, so that our cached state updates correctly.
+ */
+function handleSelectResult(data: any, select: Array<string>){
+  var serverDataMask = {};
+
+  select.forEach((field) => {
+    let hasSubObjectSelect = field.indexOf(".") !== -1;
+    if (!hasSubObjectSelect && !data.hasOwnProperty(field)){
+      // this field was selected, but is missing from the retrieved data
+      data[field] = undefined
+    } else if (hasSubObjectSelect) {
+      // this field references a sub-object,
+      // so we need to walk down the path components 
+      let pathComponents = field.split(".");
+      var obj = data;
+      var serverMask = serverDataMask;
+
+      pathComponents.forEach((component, index, arr) => {
+        // add keys if the expected data is missing
+        if (!obj[component]) {
+          obj[component] = (index == arr.length-1) ? undefined : {};
+        }
+        obj = obj[component];
+
+        //add this path component to the server mask so we can fill it in later if needed
+        if (index < arr.length-1) {
+          if (!serverMask[component]) {
+            serverMask[component] = {};
+          }
+        }
+      });
+    }
+  });
+
+  if (Object.keys(serverDataMask).length > 0) {
+    // When selecting from sub-objects, we don't want to blow away the missing
+    // information that we may have retrieved before. We've already added any
+    // missing selected keys to sub-objects, but we still need to add in the
+    // data for any previously retrieved sub-objects that were not selected.
+
+    let serverData = CoreManager.getObjectStateController().getServerData({id:data.objectId, className:data.className});
+
+    function copyMissingDataWithMask(src, dest, mask, copyThisLevel){
+      //copy missing elements at this level
+      if (copyThisLevel) {
+        for (var key in src) {
+          if (src.hasOwnProperty(key) && !dest.hasOwnProperty(key)) {
+            dest[key] = src[key]
+          }
+        }
+      }
+      for (var key in mask) {
+        //traverse into objects as needed
+        copyMissingDataWithMask(src[key], dest[key], mask[key], true);
+      }
+    }
+
+    copyMissingDataWithMask(serverData, data, serverDataMask, false);
+  }
+}
+
 /**
  * Creates a new parse Parse.Query for the given Parse.Object subclass.
  * @class Parse.Query
@@ -273,6 +337,8 @@ export default class ParseQuery {
 
     let controller = CoreManager.getQueryController();
 
+    let select = this._select;
+
     return controller.find(
       this.className,
       this.toJSON(),
@@ -285,7 +351,15 @@ export default class ParseQuery {
         if (!data.className) {
           data.className = override;
         }
-        return ParseObject.fromJSON(data, true);
+
+        // Make sure the data object contains keys for all objects that
+        // have been requested with a select, so that our cached state
+        // updates correctly.
+        if (select) {
+          handleSelectResult(data, select);
+        }
+        
+        return ParseObject.fromJSON(data, !select);
       });
     })._thenRunCallbacks(options);
   }
@@ -371,6 +445,8 @@ export default class ParseQuery {
     var params = this.toJSON();
     params.limit = 1;
 
+    var select = this._select;
+
     return controller.find(
       this.className,
       params,
@@ -383,7 +459,15 @@ export default class ParseQuery {
       if (!objects[0].className) {
         objects[0].className = this.className;
       }
-      return ParseObject.fromJSON(objects[0], true);
+
+      // Make sure the data object contains keys for all objects that
+      // have been requested with a select, so that our cached state
+      // updates correctly.
+      if (select) {
+        handleSelectResult(objects[0], select);
+      }
+
+      return ParseObject.fromJSON(objects[0], !select);
     })._thenRunCallbacks(options);
   }
 
diff --git a/src/StorageController.react-native.js b/src/StorageController.react-native.js
index 43e91a6..e13de1a 100644
--- a/src/StorageController.react-native.js
+++ b/src/StorageController.react-native.js
@@ -11,7 +11,7 @@
 
 import ParsePromise from './ParsePromise';
 // RN packager nonsense
-import { AsyncStorage } from 'react-native/Libraries/react-native/react-native.js';
+import { AsyncStorage } from 'react-native/Libraries/react-native/react-native-implementation';
 
 var StorageController = {
   async: 1,


Test patch:
diff --git a/integration/test/ParseGeoBoxTest.js b/integration/test/ParseGeoBoxTest.js
index 78b40d4..acbb204 100644
--- a/integration/test/ParseGeoBoxTest.js
+++ b/integration/test/ParseGeoBoxTest.js
@@ -11,10 +11,10 @@ describe('Geo Box', () => {
     Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
     Parse.Storage._clear();
   });
-
-  beforeEach((done) => {
+    
+  beforeEach((done) => {  
     clear().then(() => {
-      done();
+      Parse.User.logOut().then(() => { done() }, () => { done() });
     });
   });
 
diff --git a/integration/test/ParseGeoPointTest.js b/integration/test/ParseGeoPointTest.js
index 4443b63..31db8f4 100644
--- a/integration/test/ParseGeoPointTest.js
+++ b/integration/test/ParseGeoPointTest.js
@@ -9,7 +9,7 @@ const TestObject = Parse.Object.extend('TestObject');
 const TestPoint = Parse.Object.extend('TestPoint');
 
 describe('Geo Point', () => {
-  before(() => {
+  before((done) => {
     Parse.initialize('integration');
     Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
     Parse.Storage._clear();
@@ -28,8 +28,8 @@ describe('Geo Point', () => {
 
       return Parse.Object.saveAll([sacramento, honolulu, sf]);
     }).then(() => {
-      done();
-    });
+      return Parse.User.logOut();
+    }).then(() => { done() }, () => { done() });
   });
 
   it('can save geo points', (done) => {
diff --git a/integration/test/ParseObjectTest.js b/integration/test/ParseObjectTest.js
index f2aa562..c02fda4 100644
--- a/integration/test/ParseObjectTest.js
+++ b/integration/test/ParseObjectTest.js
@@ -1183,8 +1183,8 @@ describe('Parse Object', () => {
     }).then(() => {
       assert.equal(user.createdAt.getTime(), sameUser.createdAt.getTime());
       assert.equal(user.updatedAt.getTime(), sameUser.updatedAt.getTime());
-      done();
-    });
+      return Parse.User.logOut().then(() => { done(); }, () => { done(); });
+    }).catch(done.fail);
   });
 
   it('can fetchAllIfNeeded', (done) => {
diff --git a/integration/test/ParseQueryTest.js b/integration/test/ParseQueryTest.js
index b5736c4..41dc45a 100644
--- a/integration/test/ParseQueryTest.js
+++ b/integration/test/ParseQueryTest.js
@@ -19,8 +19,9 @@ describe('Parse Query', () => {
       }
       return Parse.Object.saveAll(numbers);
     }).then(() => {
-      done();
-    });
+      return Parse.User.logOut();
+    })
+    .then(() => { done() }, () => { done() });
   });
 
   it('can do basic queries', (done) => {
@@ -1182,6 +1183,10 @@ describe('Parse Query', () => {
         assert(o.get('x') <= 15);
       });
       done();
+    })
+    .catch(err => {
+      console.dir(err);
+      done.fail();
     });
   });
 
diff --git a/src/__tests__/ParseError-test.js b/src/__tests__/ParseError-test.js
new file mode 100644
index 0000000..14c6e59
--- /dev/null
+++ b/src/__tests__/ParseError-test.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2015-present, Parse, LLC.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+jest.dontMock('../ParseError');
+
+var ParseError = require('../ParseError').default;
+
+describe('ParseError', () => {
+  it('have sensible string representation', () => {
+    var error = new ParseError(123, 'some error message');
+    
+    expect(error.toString()).toMatch('ParseError');
+    expect(error.toString()).toMatch('123');
+    expect(error.toString()).toMatch('some error message');
+  });
+});
diff --git a/src/__tests__/ParseLiveQuery-test.js b/src/__tests__/ParseLiveQuery-test.js
index f6aca0d..750165c 100644
--- a/src/__tests__/ParseLiveQuery-test.js
+++ b/src/__tests__/ParseLiveQuery-test.js
@@ -11,11 +11,16 @@ jest.dontMock('../ParseLiveQuery');
 jest.dontMock('../CoreManager');
 jest.dontMock('../ParsePromise');
 jest.dontMock('../LiveQueryClient');
+jest.dontMock('../LiveQuerySubscription');
 jest.dontMock('../ParseObject');
+jest.dontMock('../ParsePromise');
+jest.dontMock('../ParseQuery');
+jest.dontMock('../EventEmitter');
 
 const ParseLiveQuery = require('../ParseLiveQuery');
 const CoreManager = require('../CoreManager');
 const ParsePromise = require('../ParsePromise').default;
+const ParseQuery = require('../ParseQuery').default;
 
 describe('ParseLiveQuery', () => {
   beforeEach(() => {
@@ -99,4 +104,83 @@ describe('ParseLiveQuery', () => {
       done();
     });
   });
+
+  it('subscribes to all subscription events', (done) => {
+
+    CoreManager.set('UserController', {
+      currentUserAsync() {
+        return ParsePromise.as({
+          getSessionToken() {
+            return 'token';
+          }
+        });
+      }
+    });
+    CoreManager.set('APPLICATION_ID', 'appid');
+    CoreManager.set('JAVASCRIPT_KEY', 'jskey');
+    CoreManager.set('LIVEQUERY_SERVER_URL', null);
+
+    const controller = CoreManager.getLiveQueryController();
+
+    controller.getDefaultLiveQueryClient().then((client) => {
+
+      const query = new ParseQuery("ObjectType");
+      query.equalTo("test", "value");
+      const ourSubscription = controller.subscribe(query, "close");
+
+      var isCalled = {};
+      ["open", 
+        "close",
+        "error",
+        "create",
+        "update", 
+        "enter", 
+        "leave", 
+        "delete"].forEach((key) =>{
+        ourSubscription.on(key, () => {
+          isCalled[key] = true;
+        });
+      });
+      
+      // controller.subscribe() completes asynchronously, 
+      // so we need to give it a chance to complete before finishing
+      setTimeout(() => { 
+        try {
+          client.connectPromise.resolve();
+          var actualSubscription = client.subscriptions.get(1);
+
+          expect(actualSubscription).toBeDefined();
+
+          actualSubscription.emit("open");
+          expect(isCalled["open"]).toBe(true);
+
+          actualSubscription.emit("close");
+          expect(isCalled["close"]).toBe(true);
+
+          actualSubscription.emit("error");
+          expect(isCalled["error"]).toBe(true);
+
+          actualSubscription.emit("create");
+          expect(isCalled["create"]).toBe(true);
+
+          actualSubscription.emit("update");
+          expect(isCalled["update"]).toBe(true);
+
+          actualSubscription.emit("enter");
+          expect(isCalled["enter"]).toBe(true);
+
+          actualSubscription.emit("leave");
+          expect(isCalled["leave"]).toBe(true);
+
+          actualSubscription.emit("delete");
+          expect(isCalled["delete"]).toBe(true);
+
+          done();
+        } catch(e){
+          done.fail(e);
+        }
+      }, 1); 
+    });
+
+  });
 });
diff --git a/src/__tests__/ParseQuery-test.js b/src/__tests__/ParseQuery-test.js
index 070dc85..c33458f 100644
--- a/src/__tests__/ParseQuery-test.js
+++ b/src/__tests__/ParseQuery-test.js
@@ -9,10 +9,14 @@
 
 jest.dontMock('../CoreManager');
 jest.dontMock('../encode');
+jest.dontMock('../decode');
 jest.dontMock('../ParseError');
 jest.dontMock('../ParseGeoPoint');
 jest.dontMock('../ParsePromise');
 jest.dontMock('../ParseQuery');
+jest.dontMock('../SingleInstanceStateController');
+jest.dontMock('../UniqueInstanceStateController');
+jest.dontMock('../ObjectStateMutations');
 
 var mockObject = function(className) {
   this.className = className;
@@ -1332,4 +1336,223 @@ describe('ParseQuery', () => {
       done();
     });
   });
+
+
+  
+  it('overrides cached object with query results', (done) => {
+    jest.dontMock("../ParseObject");
+    jest.resetModules();
+    ParseObject = require('../ParseObject').default;
+    CoreManager = require('../CoreManager');
+    ParseQuery = require('../ParseQuery').default;
+
+    ParseObject.enableSingleInstance();
+    
+    var objectToReturn = { 
+      objectId: 'T01', 
+      name: 'Name', 
+      other: 'other', 
+      className:"Thing", 
+      createdAt: '2017-01-10T10:00:00Z'
+    };
+
+    CoreManager.setQueryController({
+      find(className, params, options) {
+        return ParsePromise.as({
+          results: [objectToReturn]
+        });
+      }
+    });
+
+    var q = new ParseQuery("Thing");
+    var testObject;
+    q.find().then((results) => {
+      testObject = results[0];
+      
+      expect(testObject.get("name")).toBe("Name");
+      expect(testObject.get("other")).toBe("other");
+      
+      objectToReturn = { objectId: 'T01', name: 'Name2'};
+      var q2 = new ParseQuery("Thing");
+      return q2.find();
+    }).then((results) => {
+      expect(results[0].get("name")).toBe("Name2");
+      expect(results[0].has("other")).toBe(false);
+    }).then(() => {
+      expect(testObject.get("name")).toBe("Name2");
+      expect(testObject.has("other")).toBe(false);
+      done();
+     });
+  });
+
+  it('does not override unselected fields with select query results', (done) => {
+    jest.dontMock("../ParseObject");
+    jest.resetModules();
+    ParseObject = require('../ParseObject').default;
+    CoreManager = require('../CoreManager');
+    ParseQuery = require('../ParseQuery').default;
+
+    ParseObject.enableSingleInstance();
+    
+    var objectToReturn = { 
+      objectId: 'T01', 
+      name: 'Name', 
+      other: 'other', 
+      tbd: 'exists', 
+      className:"Thing", 
+      createdAt: '2017-01-10T10:00:00Z',
+      subObject: {key1:"value", key2:"value2", key3:"thisWillGoAway"}
+    };
+
+    CoreManager.setQueryController({
+      find(className, params, options) {
+        return ParsePromise.as({
+          results: [objectToReturn]
+        });
+      }
+    });
+
+    var q = new ParseQuery("Thing");
+    var testObject;
+    return q.find().then((results) => {
+      testObject = results[0];
+      
+      expect(testObject.get("name")).toBe("Name");
+      expect(testObject.get("other")).toBe("other");
+      expect(testObject.has("tbd")).toBe(true);
+      expect(testObject.get("subObject").key1).toBe("value");
+      expect(testObject.get("subObject").key2).toBe("value2");
+      expect(testObject.get("subObject").key3).toBe("thisWillGoAway");
+      
+      var q2 = new ParseQuery("Thing");
+      q2.select("other", "tbd", "subObject.key1", "subObject.key3");
+      objectToReturn = { objectId: 'T01', other: 'other2', subObject:{key1:"updatedValue"}};
+      return q2.find();
+    }).then((results) => {
+      expect(results[0].get("name")).toBe("Name");    //query didn't select this
+      expect(results[0].get("other")).toBe("other2"); //query selected and updated this
+      expect(results[0].has("tbd")).toBe(false);      //query selected this and it wasn't returned
+      //sub-objects should work similarly
+      expect(results[0].get("subObject").key1).toBe("updatedValue");
+      expect(results[0].get("subObject").key2).toBe("value2");
+      expect(results[0].get("subObject").key3).toBeUndefined();
+    }).then(() => {
+      expect(testObject.get("name")).toBe("Name");
+      expect(testObject.get("other")).toBe("other2");
+      expect(testObject.has("tbd")).toBe(false);
+      expect(testObject.get("subObject").key1).toBe("updatedValue");
+      expect(testObject.get("subObject").key2).toBe("value2");
+      expect(testObject.get("subObject").key3).toBeUndefined();  
+      done();
+    }, (error) => {
+      done.fail(error);
+    });
+  });
+
+  it('overrides cached object with first() results', (done) => {
+    jest.dontMock("../ParseObject");
+    jest.resetModules();
+    ParseObject = require('../ParseObject').default;
+    CoreManager = require('../CoreManager');
+    ParseQuery = require('../ParseQuery').default;
+
+    ParseObject.enableSingleInstance();
+    
+    var objectToReturn = { 
+      objectId: 'T01', 
+      name: 'Name', 
+      other: 'other', 
+      className:"Thing", 
+      createdAt: '2017-01-10T10:00:00Z'
+    };
+
+    CoreManager.setQueryController({
+      find(className, params, options) {
+        return ParsePromise.as({
+          results: [objectToReturn]
+        });
+      }
+    });
+
+    var q = new ParseQuery("Thing");
+    var testObject;
+    q.first().then((result) => {
+      testObject = result;
+      
+      expect(testObject.get("name")).toBe("Name");
+      expect(testObject.get("other")).toBe("other");
+      
+      objectToReturn = { objectId: 'T01', name: 'Name2'};
+      var q2 = new ParseQuery("Thing");
+      return q2.first();
+    }).then((result) => {
+      expect(result.get("name")).toBe("Name2");
+      expect(result.has("other")).toBe(false);
+    }).then(() => {
+      expect(testObject.get("name")).toBe("Name2");
+      expect(testObject.has("other")).toBe(false);
+      done();
+     });
+  });
+
+  it('does not override unselected fields for first() on select query', (done) => {
+    jest.dontMock("../ParseObject");
+    jest.resetModules();
+    ParseObject = require('../ParseObject').default;
+    CoreManager = require('../CoreManager');
+    ParseQuery = require('../ParseQuery').default;
+
+    ParseObject.enableSingleInstance();
+    
+    var objectToReturn = { 
+      objectId: 'T01', 
+      name: 'Name', 
+      other: 'other', 
+      tbd: 'exists', 
+      className:"Thing", 
+      subObject: {key1:"value", key2:"value2", key3:"thisWillGoAway"},
+      createdAt: '2017-01-10T10:00:00Z',
+    };
+
+    CoreManager.setQueryController({
+      find(className, params, options) {
+        return ParsePromise.as({
+          results: [objectToReturn]
+        });
+      }
+    });
+
+    var q = new ParseQuery("Thing");
+    var testObject;
+    return q.first().then((result) => {
+      testObject = result;
+      
+      expect(testObject.get("name")).toBe("Name");
+      expect(testObject.get("other")).toBe("other");
+      expect(testObject.has("tbd")).toBe(true);
+      
+      var q2 = new ParseQuery("Thing");
+      q2.select("other", "tbd", "subObject.key1", "subObject.key3");
+      objectToReturn = { objectId: 'T01', other: 'other2', subObject:{key1:"updatedValue"}};
+      return q2.first();
+    }).then((result) => {
+      expect(result.get("name")).toBe("Name");    //query didn't select this
+      expect(result.get("other")).toBe("other2"); //query selected and updated this
+      expect(result.has("tbd")).toBe(false);      //query selected this and it wasn't returned
+      //sub-objects should work similarly
+      expect(result.get("subObject").key1).toBe("updatedValue");
+      expect(result.get("subObject").key2).toBe("value2");
+      expect(result.get("subObject").key3).toBeUndefined();
+    }).then(() => {
+      expect(testObject.get("name")).toBe("Name");
+      expect(testObject.get("other")).toBe("other2");
+      expect(testObject.has("tbd")).toBe(false);  
+      expect(testObject.get("subObject").key1).toBe("updatedValue");
+      expect(testObject.get("subObject").key2).toBe("value2");
+      expect(testObject.get("subObject").key3).toBeUndefined(); 
+      done();
+    }, (error) => {
+      done.fail(error);
+    });
+  });
 });
diff --git a/src/__tests__/Storage-test.js b/src/__tests__/Storage-test.js
index 70ac9fb..76df4db 100644
--- a/src/__tests__/Storage-test.js
+++ b/src/__tests__/Storage-test.js
@@ -29,7 +29,7 @@ var mockRNStorageInterface = {
   },
 };
 
-jest.mock('react-native/Libraries/react-native/react-native.js', () => {
+jest.mock('react-native/Libraries/react-native/react-native-implementation', () => {
   return {AsyncStorage: mockRNStorageInterface};
 }, {virtual: true});