Merge branch 'alpha' into log

Author: mtrezza

integration/test/IdempotencyTest.js

@@ -1,47 +1,39 @@
 'use strict';
+const originalFetch = global.fetch;
 
 const Parse = require('../../node');
 const sleep = require('./sleep');
-
 const Item = Parse.Object.extend('IdempotencyItem');
-const RESTController = Parse.CoreManager.getRESTController();
 
-const XHR = RESTController._getXHR();
-function DuplicateXHR(requestId) {
-  function XHRWrapper() {
-    const xhr = new XHR();
-    const send = xhr.send;
-    xhr.send = function () {
-      this.setRequestHeader('X-Parse-Request-Id', requestId);
-      send.apply(this, arguments);
-    };
-    return xhr;
-  }
-  return XHRWrapper;
+function DuplicateRequestId(requestId) {
+  global.fetch = async (...args) => {
+    const options = args[1];
+    options.headers['X-Parse-Request-Id'] = requestId;
+    return originalFetch(...args);
+  };
 }
 
 describe('Idempotency', () => {
-  beforeEach(() => {
-    RESTController._setXHR(XHR);
+  afterEach(() => {
+    global.fetch = originalFetch;
   });
 
   it('handle duplicate cloud code function request', async () => {
-    RESTController._setXHR(DuplicateXHR('1234'));
+    DuplicateRequestId('1234');
     await Parse.Cloud.run('CloudFunctionIdempotency');
     await expectAsync(Parse.Cloud.run('CloudFunctionIdempotency')).toBeRejectedWithError(
       'Duplicate request'
     );
     await expectAsync(Parse.Cloud.run('CloudFunctionIdempotency')).toBeRejectedWithError(
       'Duplicate request'
     );
-
     const query = new Parse.Query(Item);
     const results = await query.find();
     expect(results.length).toBe(1);
   });
 
   it('handle duplicate job request', async () => {
-    RESTController._setXHR(DuplicateXHR('1234'));
+    DuplicateRequestId('1234');
     const params = { startedBy: 'Monty Python' };
     const jobStatusId = await Parse.Cloud.startJob('CloudJob1', params);
     await expectAsync(Parse.Cloud.startJob('CloudJob1', params)).toBeRejectedWithError(
@@ -61,12 +53,12 @@ describe('Idempotency', () => {
   });
 
   it('handle duplicate POST / PUT request', async () => {
-    RESTController._setXHR(DuplicateXHR('1234'));
+    DuplicateRequestId('1234');
     const testObject = new Parse.Object('IdempotentTest');
     await testObject.save();
     await expectAsync(testObject.save()).toBeRejectedWithError('Duplicate request');
 
-    RESTController._setXHR(DuplicateXHR('5678'));
+    DuplicateRequestId('5678');
     testObject.set('foo', 'bar');
     await testObject.save();
     await expectAsync(testObject.save()).toBeRejectedWithError('Duplicate request');

integration/test/ParseFileTest.js

@@ -43,6 +43,29 @@ describe('Parse.File', () => {
     file.cancel();
   });
 
+  it('can get file upload / download progress', async () => {
+    const file = new Parse.File('parse-js-test-file', [61, 170, 236, 120]);
+    let progress = 0;
+    await file.save({
+      progress: (value, loaded, total) => {
+        progress = value;
+        expect(loaded).toBeDefined();
+        expect(total).toBeDefined();
+      },
+    });
+    expect(progress).toBe(1);
+    progress = 0;
+    file._data = null;
+    await file.getData({
+      progress: (value, loaded, total) => {
+        progress = value;
+        expect(loaded).toBeDefined();
+        expect(total).toBeDefined();
+      },
+    });
+    expect(progress).toBe(1);
+  });
+
   it('can not get data from unsaved file', async () => {
     const file = new Parse.File('parse-server-logo', [61, 170, 236, 120]);
     file._data = null;

integration/test/ParseLocalDatastoreTest.js

@@ -38,8 +38,6 @@ function runTest(controller) {
       Parse.initialize('integration');
       Parse.CoreManager.set('SERVER_URL', serverURL);
       Parse.CoreManager.set('MASTER_KEY', 'notsosecret');
-      const RESTController = Parse.CoreManager.getRESTController();
-      RESTController._setXHR(require('xmlhttprequest').XMLHttpRequest);
       Parse.enableLocalDatastore();
     });
 
@@ -1082,8 +1080,6 @@ function runTest(controller) {
       Parse.initialize('integration');
       Parse.CoreManager.set('SERVER_URL', serverURL);
       Parse.CoreManager.set('MASTER_KEY', 'notsosecret');
-      const RESTController = Parse.CoreManager.getRESTController();
-      RESTController._setXHR(require('xmlhttprequest').XMLHttpRequest);
       Parse.enableLocalDatastore();
 
       const numbers = [];

integration/test/ParseReactNativeTest.js

@@ -8,8 +8,6 @@ const LocalDatastoreController =
 const StorageController = require('../../lib/react-native/StorageController.default').default;
 const RESTController = require('../../lib/react-native/RESTController').default;
 
-RESTController._setXHR(require('xmlhttprequest').XMLHttpRequest);
-
 describe('Parse React Native', () => {
   beforeEach(() => {
     // Set up missing controllers and configurations