fix: review issues

Author: leeyeh

src/file.js

@@ -323,8 +323,8 @@ module.exports = function(AV) {
    * if (fileUploadControl.files.length > 0) {
    *   var file = fileUploadControl.files[0];
    *   var name = "photo.jpg";
-   *   var parseFile = new AV.File(name, file);
-   *   parseFile.save().then(function() {
+   *   var file = new AV.File(name, file);
+   *   file.save().then(function() {
    *     // The file has been saved to AV.
    *   }, function(error) {
    *     // The file either could not be read, or could not be saved to AV.

src/object.js

@@ -927,9 +927,14 @@ module.exports = function(AV) {
           json._fetchWhenSave = true;
         }
         if (options.query) {
-          try {
-            json._where = options.query.toJSON().where;
-          } catch (e) {
+          var queryJSON;
+          if (typeof options.query.toJSON === 'function') {
+            queryJSON = options.query.toJSON();
+            if (queryJSON) {
+              json._where = queryJSON.where;
+            }
+          }
+          if (!json._where) {
             var error = new Error('options.query is not an AV.Query');
             return AV.Promise.error(error)._thenRunCallbacks(options, model);
           }

src/utils.js

@@ -378,13 +378,14 @@ const init = (AV) => {
     if (objectId) {
       apiURL += "/" + objectId;
     }
-    if ((route ==='users' || route === 'classes') && dataObject){
+    if ((route ==='users' || route === 'classes') && dataObject) {
+      apiURL += '?';
       if (dataObject._fetchWhenSave) {
         delete dataObject._fetchWhenSave;
-        apiURL += '?new=true';
+        apiURL += '&new=true';
       }
       if (dataObject._where) {
-        apiURL += ('?where=' + encodeURIComponent(JSON.stringify(dataObject._where)));
+        apiURL += ('&where=' + encodeURIComponent(JSON.stringify(dataObject._where)));
         delete dataObject._where;
       }
     }

test/object.js

@@ -119,17 +119,26 @@ describe('Objects', function(){
         }
       });
     });
-    it("should not update prop when query not match",function(done){
-      gameScore.set("score", 10000);
+    it('should not update prop when query not match',function(done){
+      gameScore.set('score', 10000);
       gameScore.save(null, {
-        query: new AV.Query(GameScore).equalTo('score', -1),
-        success: function(result) {
-          done(new Error('should not success'));
-        },
-        error: function(gameScore, error) {
-          expect(error.code).to.be.eql(305);
-          done();
-        }
+        query: new AV.Query(GameScore).equalTo('score', -1)
+      }).then(function(result) {
+        done(new Error('should not success'));
+      }, function(error) {
+        expect(error.code).to.be.eql(305);
+        done();
+      });
+    });
+    it('should update prop when query match',function(done){
+      gameScore.set('score', 10000);
+      gameScore.save(null, {
+        query: new AV.Query(GameScore).notEqualTo('score', -1),
+        fetchWhenSave: true
+      }).then(function(result) {
+        done();
+      }, function(error) {
+        done(error);
       });
     });
   });