Merge branch 'alpha' into ts-def

Author: mtrezza

integration/test/ParseDistTest.js

@@ -32,9 +32,9 @@ for (const fileName of ['parse.js', 'parse.min.js']) {
     });
 
     it('can query an object', async () => {
-      const obj = await new Parse.Object('TestObject').save();
+      const obj = await new Parse.Object('TestObjects').save();
       const response = await page.evaluate(async () => {
-        const object = await new Parse.Query('TestObject').first();
+        const object = await new Parse.Query('TestObjects').first();
         return object.id;
       });
       expect(response).toBeDefined();

integration/test/ParseLiveQueryTest.js

@@ -112,9 +112,15 @@ describe('Parse LiveQuery', () => {
       },
       sessionToken: undefined,
     };
+    const openPromise = resolvingPromise();
+    client.on('open', () => {
+      if (client.state === 'reconnecting') {
+        openPromise.resolve();
+      }
+    });
     await client.connectPromise;
     client.socket.send(JSON.stringify(subscribeRequest));
-    await sleep(1000);
+    await openPromise;
     expect(resubscribeSpy).toHaveBeenCalled();
     await client.close();
   });

integration/test/ParseLocalDatastoreTest.js

@@ -29,7 +29,7 @@ function runTest(controller) {
 
   describe(`Parse Object Pinning (${controller.name})`, () => {
     beforeEach(async () => {
-      const StorageController = require(controller.file);
+      const StorageController = require(controller.file).default;
       Parse.CoreManager.setAsyncStorage(mockRNStorage);
       Parse.CoreManager.setLocalDatastoreController(StorageController);
       Parse.CoreManager.setEventEmitter(require('events').EventEmitter);
@@ -1073,7 +1073,7 @@ function runTest(controller) {
 
   describe(`Parse Query Pinning (${controller.name})`, () => {
     beforeEach(async () => {
-      const StorageController = require(controller.file);
+      const StorageController = require(controller.file).default;
       Parse.CoreManager.setAsyncStorage(mockRNStorage);
       Parse.CoreManager.setLocalDatastoreController(StorageController);
       Parse.CoreManager.setEventEmitter(require('events').EventEmitter);

integration/test/ParseReactNativeTest.js

@@ -2,10 +2,11 @@
 
 const Parse = require('../../react-native');
 const { resolvingPromise } = require('../../lib/react-native/promiseUtils');
-const CryptoController = require('../../lib/react-native/CryptoController');
-const LocalDatastoreController = require('../../lib/react-native/LocalDatastoreController.default');
-const StorageController = require('../../lib/react-native/StorageController.default');
-const RESTController = require('../../lib/react-native/RESTController');
+const CryptoController = require('../../lib/react-native/CryptoController').default;
+const LocalDatastoreController =
+  require('../../lib/react-native/LocalDatastoreController.default').default;
+const StorageController = require('../../lib/react-native/StorageController.default').default;
+const RESTController = require('../../lib/react-native/RESTController').default;
 
 RESTController._setXHR(require('xmlhttprequest').XMLHttpRequest);