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

# Conflicts:
#	jasmine.json
#	package-lock.json

Author: Moumouls

CHANGELOG.md

@@ -1,7 +1,56 @@
 # Parse-SDK-JS
 
 ### master
-[Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/2.19.0...master)
+[Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/3.1.0...master)
+- Add className argument to Parse Object subclass constructor ([#1315](https://github.com/parse-community/Parse-SDK-JS/pull/1315))
+
+## 3.1.0
+[Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/3.0.0...3.1.0)
+
+**Breaking Changes**
+`Parse.Push.send` will now return the pushStatusId instead of `{ result: true }`
+
+**Features**
+- Add Server Health Check `Parse.getServerHealth()` ([#1307](https://github.com/parse-community/Parse-SDK-JS/pull/1307))
+- Allow saving with custom objectId `Parse.allowCustomObjectId = true` ([#1309](https://github.com/parse-community/Parse-SDK-JS/pull/1309))
+- `Parse.Push.send` now returns pushStatusId ([#1302](https://github.com/parse-community/Parse-SDK-JS/pull/1302))
+- Add `Parse.Push.getPushStatus` ([#1302](https://github.com/parse-community/Parse-SDK-JS/pull/1302))
+
+**Improvements**
+- Add modifiers to `query.startsWith` ([#1306](https://github.com/parse-community/Parse-SDK-JS/pull/1306))
+- Add modifiers to `query.endsWith` ([#1306](https://github.com/parse-community/Parse-SDK-JS/pull/1306))
+
+**Fixes**
+- EventuallyQueue now polls against `/health` endpoint, caused 403 forbidden side effect ([#1305](https://github.com/parse-community/Parse-SDK-JS/pull/1305))
+- Allow nested increment on undefined fields ([#1303](https://github.com/parse-community/Parse-SDK-JS/pull/1303))
+- Handle increment on nested fields any level deep ([#1301](https://github.com/parse-community/Parse-SDK-JS/pull/1301))
+
+## 3.0.0
+[Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/2.19.0...3.0.0)
+
+**Breaking Changes**
+For security purposes, logIn will default to `POST` instead of `GET` method. ([#1284](https://github.com/parse-community/Parse-SDK-JS/pull/1284))
+
+If you need to use `GET` set the `usePost` option to false.
+
+`Parse.User.logIn('username', 'password', { usePost: false })`
+
+**Features**
+- Add EventuallyQueue API, object.saveEventually, object.destroyEventually ([#1291](https://github.com/parse-community/Parse-SDK-JS/pull/1291))
+- Add Parse.CLP Object to control ClassLevelPermissions ([#1145](https://github.com/parse-community/Parse-SDK-JS/pull/1145))
+- Add option `{ json: true }` on queries ([#1294](https://github.com/parse-community/Parse-SDK-JS/pull/1294))
+- Add IndexedDB Storage Controller ([#1297](https://github.com/parse-community/Parse-SDK-JS/pull/1297))
+- Parse.User.isCurrentAsync() for async storage ([#1298](https://github.com/parse-community/Parse-SDK-JS/pull/1298))
+
+**Improvements**
+- Add useMasterKey option to Parse.File.destroy() ([#1285](https://github.com/parse-community/Parse-SDK-JS/pull/1285))
+- User management on React-Native ([#1298](https://github.com/parse-community/Parse-SDK-JS/pull/1298))
+
+**Fixes**
+- Allow connect to LiveQuery with null fields ([#1282](https://github.com/parse-community/Parse-SDK-JS/pull/1282))
+- fromJSON: Return date if value is type `Date` ([#1293](https://github.com/parse-community/Parse-SDK-JS/pull/1293))
+- fromJSON: Allow keys to dirty, allows save fromJSON ([#1295](https://github.com/parse-community/Parse-SDK-JS/pull/1295))
+- Parse.Schema.addField accepts Pointer and Relation types ([#1281](https://github.com/parse-community/Parse-SDK-JS/pull/1281))
 
 ## 2.19.0
 [Full Changelog](https://github.com/parse-community/Parse-SDK-JS/compare/2.18.0...2.19.0)

README.md

@@ -44,6 +44,12 @@ const Parse = require('parse');
 import Parse from 'parse/dist/parse.min.js';
 ```
 
+For web worker or browser applications, indexedDB storage is available:
+
+```js
+Parse.CoreManager.setStorageController(Parse.IndexedDB);
+```
+
 For server-side applications or Node.js command line tools, include `'parse/node'`:
 
 ```js

integration/server.js

@@ -2,7 +2,17 @@
   "env": {
       "jasmine": true
   },
-  "globals": {},
+  "globals": {
+    "Child": true,
+    "Container": true,
+    "DiffObject": true,
+    "Item": true,
+    "Parse": true,
+    "Parent": true,
+    "reconfigureServer": true,
+    "TestObject": true,
+    "TestPoint": true
+  },
   "rules": {
     "no-console": [0],
     "no-var": "error"

integration/test/.eslintrc.json

@@ -1,17 +1,9 @@
 'use strict';
 
 const assert = require('assert');
-const clear = require('./clear');
 const Parse = require('../../node');
 
 describe('Array Operations', () => {
-  beforeAll(done => {
-    Parse.initialize('integration');
-    Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
-    Parse.Storage._clear();
-    clear().then(done).catch(done.fail);
-  });
-
   it('initializes a field', done => {
     const object = new Parse.Object('TestObject');
     object.set('strings', ['foo', 'bar', 'baz']);
@@ -375,7 +367,7 @@ describe('Array Operations', () => {
       });
   });
 
-  it('fails when combining remove with add unique', done => {
+  it('fails when combining addUnique with remove', done => {
     const object = new Parse.Object('TestObject');
     object.set('strings', ['foo', 'bar']);
     object

integration/test/ArrayOperationsTest.js

@@ -1,25 +1,9 @@
 'use strict';
 
 const assert = require('assert');
-const clear = require('./clear');
 const Parse = require('../../node');
 
-const TestObject = Parse.Object.extend('TestObject');
-const Parent = Parse.Object.extend('Parent');
-const Child = Parse.Object.extend('Child');
-
 describe('Dirty Objects', () => {
-  beforeEach(done => {
-    Parse.initialize('integration');
-    Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
-    Parse.Storage._clear();
-    clear()
-      .then(() => {
-        done();
-      })
-      .catch(done.fail);
-  });
-
   it('tracks dirty arrays', done => {
     const array = [1];
     const object = new TestObject();

integration/test/DirtyTest.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const clear = require('./clear');
 const Parse = require('../../node');
 
 const Item = Parse.Object.extend('IdempotencyItem');
@@ -21,14 +20,8 @@ function DuplicateXHR(requestId) {
 }
 
 describe('Idempotency', () => {
-  beforeEach(done => {
-    Parse.initialize('integration', null, 'notsosecret');
-    Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
-    Parse.Storage._clear();
+  beforeEach(() => {
     RESTController._setXHR(XHR);
-    clear().then(() => {
-      done();
-    });
   });
 
   it('handle duplicate cloud code function request', async () => {

integration/test/IdempotencyTest.js

@@ -1,23 +1,9 @@
 'use strict';
 
 const assert = require('assert');
-const clear = require('./clear');
 const Parse = require('../../node');
 
-const TestObject = Parse.Object.extend('TestObject');
-
 describe('Increment', () => {
-  beforeEach(done => {
-    Parse.initialize('integration');
-    Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
-    Parse.Storage._clear();
-    clear()
-      .then(() => {
-        done();
-      })
-      .catch(done.fail);
-  });
-
   it('can increment a field', done => {
     const object = new TestObject();
     object.set('score', 1);

integration/test/IncrementTest.js

@@ -1,29 +1,11 @@
 'use strict';
 
 const assert = require('assert');
-const clear = require('./clear');
 const Parse = require('../../node');
 
-const TestObject = Parse.Object.extend('TestObject');
-
 describe('Parse.ACL', () => {
-  beforeEach(done => {
-    Parse.initialize('integration');
-    Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
-    Parse.Storage._clear();
+  beforeEach(() => {
     Parse.User.enableUnsafeCurrentUser();
-    clear()
-      .then(() => {
-        Parse.User.logOut().then(
-          () => {
-            done();
-          },
-          () => {
-            done();
-          }
-        );
-      })
-      .catch(done.fail);
   });
 
   it('acl must be valid', () => {
@@ -61,7 +43,7 @@ describe('Parse.ACL', () => {
     assert.equal(object.getACL().getPublicReadAccess(), false);
     assert.equal(object.getACL().getPublicWriteAccess(), false);
 
-    await await Parse.User.logOut();
+    await Parse.User.logOut();
     try {
       const query = new Parse.Query(TestObject);
       await query.get(object.id);
@@ -214,7 +196,7 @@ describe('Parse.ACL', () => {
     object.getACL().setPublicReadAccess(true);
     await object.save();
 
-    Parse.User.logOut();
+    await Parse.User.logOut();
     const o = await new Parse.Query(TestObject).get(object.id);
     assert(o);
   });
@@ -232,7 +214,7 @@ describe('Parse.ACL', () => {
     object.getACL().setPublicReadAccess(true);
     await object.save();
 
-    Parse.User.logOut();
+    await Parse.User.logOut();
     const o = await new Parse.Query('AlsoUniqueObject').find();
 
     assert(o.length > 0);
@@ -251,7 +233,7 @@ describe('Parse.ACL', () => {
     object.getACL().setPublicReadAccess(true);
     await object.save();
 
-    Parse.User.logOut();
+    await Parse.User.logOut();
     object.set('score', 10);
     try {
       await object.save();
@@ -273,7 +255,7 @@ describe('Parse.ACL', () => {
     object.getACL().setPublicReadAccess(true);
     await object.save();
 
-    Parse.User.logOut();
+    await Parse.User.logOut();
     try {
       await object.destroy();
     } catch (e) {

integration/test/ParseACLTest.js

@@ -1,25 +1,10 @@
 'use strict';
 
 const assert = require('assert');
-const clear = require('./clear');
 const Parse = require('../../node');
 const sleep = require('./sleep');
 
 describe('Parse Cloud', () => {
-  beforeAll(done => {
-    Parse.initialize('integration', null, 'notsosecret');
-    Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
-    Parse.Storage._clear();
-    clear().then(
-      () => {
-        done();
-      },
-      () => {
-        done();
-      }
-    );
-  });
-
   it('run function', done => {
     const params = { key1: 'value2', key2: 'value1' };
     Parse.Cloud.run('bar', params)
@@ -117,8 +102,13 @@ describe('Parse Cloud', () => {
     let jobStatus = await Parse.Cloud.getJobStatus(jobStatusId);
     assert.equal(jobStatus.get('status'), 'running');
 
-    await sleep(2000);
-
+    const checkJobStatus = async () => {
+      const result = await Parse.Cloud.getJobStatus(jobStatusId);
+      return result && result.get('status') === 'succeeded';
+    };
+    while (!(await checkJobStatus())) {
+      await sleep(100);
+    }
     jobStatus = await Parse.Cloud.getJobStatus(jobStatusId);
     assert.equal(jobStatus.get('status'), 'succeeded');
   });

integration/test/ParseCloudTest.js

@@ -1,23 +1,13 @@
 'use strict';
 
 const assert = require('assert');
-const clear = require('./clear');
 const Parse = require('../../node');
 
 function testConfig() {
   return Parse.Config.save({ internal: 'i', string: 's', number: 12 }, { internal: true });
 }
 
 describe('Parse Config', () => {
-  beforeEach(done => {
-    Parse.initialize('integration', null, 'notsosecret');
-    Parse.CoreManager.set('SERVER_URL', 'http://localhost:1337/parse');
-    Parse.Storage._clear();
-    clear().then(() => {
-      done();
-    });
-  });
-
   it('can create a config', async () => {
     const config = await testConfig();