Merge branch 'upstream' into login-authData-from-prettier

# Conflicts:
#	integration/test/ParseQueryTest.js
#	package-lock.json
#	package.json
#	src/ParseUser.js
#	src/__tests__/ParseUser-test.js

Author: Moumouls

integration/test/ParseLocalDatastoreTest.js

@@ -2375,22 +2375,6 @@ function runTest(controller) {
       assert(['Billy', 'Tom'].includes(results[1].get('name')));
     });
 
-    it(`${controller.name} supports objects with length`, async () => {
-      const obj = new TestObject();
-      obj.set('length', 5);
-      assert.equal(obj.get('length'), 5);
-      await obj.save();
-      await obj.pin();
-
-      const query = new Parse.Query(TestObject);
-      query.equalTo('objectId', obj.id);
-      query.fromLocalDatastore();
-      const results = await query.find();
-
-      assert.equal(results.length, 1);
-      assert.equal(results[0].get('length'), 5);
-    });
-
     it(`${controller.name} can include User fields`, async () => {
       const user = await Parse.User.signUp('bob', 'password', { age: 21 });
       const obj = new TestObject();

integration/test/ParseQueryTest.js

@@ -1721,22 +1721,17 @@ describe('Parse Query', () => {
       });
   });
 
-  it('supports objects with length', done => {
+  it('supports objects with length', async done => {
     const obj = new TestObject();
     obj.set('length', 5);
     assert.equal(obj.get('length'), 5);
-    obj
-      .save()
-      .then(() => {
-        const query = new Parse.Query(TestObject);
-        query.equalTo('objectId', obj.id);
-        return query.find();
-      })
-      .then(results => {
-        assert.equal(results.length, 1);
-        assert.equal(results[0].get('length'), 5);
-        done();
-      });
+    try {
+      await obj.save();
+      done.fail();
+    } catch (e) {
+      assert.strictEqual(e.message, 'Invalid field name: length.');
+      done();
+    }
   });
 
   it('can include User fields', done => {

package-lock.json

@@ -65,17 +65,17 @@
     "gulp-rename": "2.0.0",
     "gulp-uglify": "3.0.2",
     "gulp-watch": "5.0.1",
-    "husky": "^4.3.5",
+    "husky": "4.3.5",
     "jasmine": "3.5.0",
     "jasmine-reporters": "2.3.2",
     "jest": "24.9.0",
     "jsdoc": "3.6.3",
     "jsdoc-babel": "0.5.0",
-    "lint-staged": "^10.5.3",
+    "lint-staged": "10.5.3",
     "metro-react-native-babel-preset": "0.59.0",
     "mongodb-runner": "mongodb-js/runner",
     "parse-server": "github:parse-community/parse-server#master",
-    "prettier": "^2.2.1",
+    "prettier": "2.2.1",
     "regenerator-runtime": "0.13.5",
     "start-server-and-test": "^1.11.6",
     "vinyl-source-stream": "2.0.0"
@@ -100,7 +100,7 @@
     "prepare": "npm run build",
     "release_docs": "./release_docs.sh",
     "gulp": "gulp",
-    "prettier": "prettier --write {src,integration}/{**/*,*}.js && npm run lint:fix",
+    "prettier": "prettier --write '{src,integration}/{**/*,*}.js' && npm run lint:fix",
     "cross-env": "cross-env"
   },
   "husky": {
@@ -110,7 +110,8 @@
   },
   "lint-staged": {
     "{src,integration}/{**/*,*}.js": [
-      "prettier",
+      "prettier --write",
+      "eslint --fix --cache",
       "git add"
     ]
   },

package.json

@@ -10,17 +10,17 @@
 // We need this until Jest finishes upgrading to Jasmine 2.0
 module.exports = function asyncHelper(fn) {
   let finished = false;
-  const done = function() {
+  const done = function () {
     finished = true;
   };
 
-  return function() {
-    runs(function() {
+  return function () {
+    runs(function () {
       fn(done);
     });
 
-    waitsFor(function() {
+    waitsFor(function () {
       return finished;
     });
   };
-}
+};

src/__tests__/test_helpers/asyncHelper.js

@@ -28,12 +28,12 @@ const mockRNStorage = {
   },
 
   multiGet(keys, cb) {
-    const objects = keys.map((key) => [key, mockStorage[key]]);
+    const objects = keys.map(key => [key, mockStorage[key]]);
     cb(undefined, objects);
   },
 
   multiRemove(keys, cb) {
-    keys.map((key) => delete mockStorage[key]);
+    keys.map(key => delete mockStorage[key]);
     cb(undefined);
   },
 

src/__tests__/test_helpers/mockRNStorage.js

@@ -30,7 +30,7 @@ const mockWeChat = {
 
   request(options) {
     return {
-      onProgressUpdate: (cb) => {
+      onProgressUpdate: cb => {
         progressCallback = cb;
       },
       abort: () => {
@@ -43,8 +43,8 @@ const mockWeChat = {
           data: {},
         });
         options.fail();
-      }
-    }
+      },
+    };
   },
 
   connectSocket() {},

src/__tests__/test_helpers/mockWeChat.js

@@ -17,27 +17,27 @@
  * `upload` can be provided to mock the XMLHttpRequest.upload property.
  */
 function mockXHR(results, options = {}) {
-  const XHR = function() { };
+  const XHR = function () {};
   let attempts = 0;
   const headers = {};
   XHR.prototype = {
-    open: function() { },
+    open: function () {},
     setRequestHeader: jest.fn((key, value) => {
       headers[key] = value;
     }),
-    getRequestHeader: function(key) {
+    getRequestHeader: function (key) {
       return headers[key];
     },
-    upload: function() { },
-    send: function() {
+    upload: function () {},
+    send: function () {
       this.status = results[attempts].status;
       this.responseText = JSON.stringify(results[attempts].response || {});
       this.readyState = 4;
       attempts++;
       this.onreadystatechange();
       this.onprogress(options.progress);
       this.upload.onprogress(options.progress);
-    }
+    },
   };
   return XHR;
 }