Fix file upload progress

src/RESTController.js

@@ -158,15 +158,31 @@ const RESTController = {
       for (const key in customHeaders) {
         headers[key] = customHeaders[key];
       }
-      xhr.onprogress = (event) => {
-        if(options && typeof options.progress === 'function') {
+
+      function handleProgress(event) {
+        if (options && typeof options.progress === 'function') {
           if (event.lengthComputable) {
-            options.progress(event.loaded / event.total, event.loaded, event.total);
+            options.progress(
+              event.loaded / event.total,
+              event.loaded,
+              event.total
+            );
           } else {
             options.progress(null);
           }
         }
+      }
+
+      xhr.onprogress = (event) => {
+        handleProgress(event);
       };
+
+      if (xhr.upload) {
+        xhr.upload.onprogress = (event) => {
+          handleProgress(event);
+        }
+      }
+
       xhr.open(method, url, true);
 
       for (const h in headers) {

src/__tests__/ParseFile-test.js

@@ -30,7 +30,7 @@ jest.setMock('../LocalDatastore', mockLocalDatastore);
 function generateSaveMock(prefix) {
   return function(name, payload, options) {
     if (options && typeof options.progress === 'function') {
-      options.progress(0.5);
+      options.progress(0.5, 5, 10);
     }
     return Promise.resolve({
       name: name,
@@ -236,7 +236,7 @@ describe('ParseFile', () => {
     jest.spyOn(options, 'progress');
 
     return file.save(options).then(function(f) {
-      expect(options.progress).toHaveBeenCalledWith(0.5);
+      expect(options.progress).toHaveBeenCalledWith(0.5, 5, 10);
       expect(f).toBe(file);
       expect(f.name()).toBe('progress.txt');
       expect(f.url()).toBe('http://files.parsetfss.com/a/progress.txt');

src/__tests__/RESTController-test.js

@@ -428,7 +428,7 @@ describe('RESTController', () => {
     CoreManager.set('SERVER_AUTH_TOKEN', null);
   });
 
-  it('reports upload progress of the AJAX request when callback is provided', (done) => {
+  it('reports upload/download progress of the AJAX request when callback is provided', (done) => {
     const xhr = mockXHR([{ status: 200, response: { success: true } }], {
       progress: {
         lengthComputable: true,
@@ -445,6 +445,7 @@ describe('RESTController', () => {
 
     RESTController.ajax('POST', 'files/upload.txt', {}, {}, options).then(({ response, status }) => {
       expect(options.progress).toHaveBeenCalledWith(0.5, 5, 10);
+      expect(options.progress).toHaveBeenCalledTimes(2);
       expect(response).toEqual({ success: true });
       expect(status).toBe(200);
       done();

src/__tests__/test_helpers/mockXHR.js

@@ -22,13 +22,15 @@ function mockXHR(results, options = {}) {
   XHR.prototype = {
     open: function() { },
     setRequestHeader: 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;