Merge pull request #329 from leeyeh/fix-242

fix(Query): AV.Query#get use fetch now

Author: leeyeh

src/object.js

@@ -816,6 +816,9 @@ module.exports = function(AV) {
      *     completes.
      */
     fetch: function(fetchOptions = {}, options) {
+      if (_.isArray(fetchOptions.keys)) {
+        fetchOptions.keys = fetchOptions.keys.join(',');
+      }
       if (_.isArray(fetchOptions.include)) {
         fetchOptions.include = fetchOptions.include.join(',');
       }

src/query.js

@@ -178,18 +178,17 @@ module.exports = function(AV) {
       }
 
       var self = this;
-      self.equalTo('objectId', objectId);
 
-      return self.first(options).then(function(response) {
-        if (!_.isEmpty(response)) {
-          return response;
-        }
+      var obj = self._newObject();
+      obj.id = objectId;
 
-        var errorObject = new AVError(AVError.OBJECT_NOT_FOUND,
-                                          "Object not found.");
-        return AV.Promise.reject(errorObject);
+      var queryJSON = self.toJSON();
+      var fetchOptions = {};
 
-      });
+      if (queryJSON.keys) fetchOptions.keys = queryJSON.keys;
+      if (queryJSON.include) fetchOptions.include = queryJSON.include;
+
+      return obj.fetch(fetchOptions, options);
     },
 
     /**

test/object.js

@@ -11,10 +11,8 @@ var BackbonePerson = AV.Object.extend('Person');
 describe('Objects', function(){
   var objId;
   var gameScore = GameScore.new();
-  after(function(done) {
-    gameScore.destroy().then(function() {
-      done();
-    });
+  after(function() {
+    return gameScore.destroy();
   });
   it('getter/setter compatible', function() {
     Object.defineProperty(Post.prototype, 'name', {
@@ -138,14 +136,14 @@ describe('Objects', function(){
   });
 
   describe('Fetching Objects', () => {
-    it('fetch', () => 
+    it('fetch', () =>
       AV.Object.createWithoutData('GameScore', gameScore.id).fetch().then(score => {
         expect(score.get('score')).to.be.a('number');
         expect(score.createdAt).to.be.a(Date);
         expect(score.id).to.be.eql(gameScore.id);
       })
     );
-    it('fetchAll', () => 
+    it('fetchAll', () =>
       AV.Object.fetchAll([
         AV.Object.createWithoutData('GameScore', gameScore.id),
         AV.Object.createWithoutData('GameScore', gameScore.id),
@@ -252,7 +250,7 @@ describe('Objects', function(){
         query.include("parent");
         return query.get(myComment.id);
       }).then(function(obj) {
-        expect(obj.get("parent").get("title")).to.be("post1");        
+        expect(obj.get("parent").get("title")).to.be("post1");
       });
     });
 
@@ -358,8 +356,20 @@ describe('Objects', function(){
         });
       });
     });
-    
 
+    it("fetchOptions keys", function(){
+      var person = new Person();
+      person.set('pname', 'dennis');
+      person.set('age', 1)
+      return person.save().then(() =>
+        AV.Object.createWithoutData('Person', person.id).fetch({
+          keys: ['pname'],
+        })
+      ).then(function(person) {
+        expect(person.get('pname')).to.be('dennis');
+        expect(person.get('age')).to.be(undefined);
+      });
+    });
 
   });
 

test/user.js

@@ -110,7 +110,7 @@ describe("User", function() {
       var user = AV.User.current();
       return new AV.Query('_Role').equalTo('name', 'testRole').first()
       .then(function(role) {
-        return role.destroy();
+        return role.destroy({ useMasterKey: true });
       }).catch(function() {
         // already destroyed
       }).then(function() {