-
-
Notifications
You must be signed in to change notification settings - Fork 596
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for providing file upload progress. #373
Merged
dplewis
merged 5 commits into
parse-community:master
from
dosemedia:feature/add-file-upload-progress-callback
Dec 18, 2018
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8f30a88
Add support for providing file upload progress.
aaron-blondeau-dose 151bfb9
Merge branch 'master' into feature/add-file-upload-progress-callback
dplewis 196ba8e
clean up
dplewis 058a30b
Merge branch 'master' into feature/add-file-upload-progress-callback
dplewis 82970fb
improve documentation
dplewis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,17 +6,20 @@ | |
* LICENSE file in the root directory of this source tree. An additional grant | ||
* of patent rights can be found in the PATENTS file in the same directory. | ||
*/ | ||
|
||
/* global File */ | ||
jest.autoMockOff(); | ||
|
||
const ParseFile = require('../ParseFile').default; | ||
const CoreManager = require('../CoreManager'); | ||
|
||
function generateSaveMock(prefix) { | ||
return function(name) { | ||
return function(name, payload, options) { | ||
if (options && typeof options.progress === 'function') { | ||
options.progress(0.5); | ||
} | ||
return Promise.resolve({ | ||
name: name, | ||
url: prefix + name | ||
url: prefix + name, | ||
}); | ||
}; | ||
} | ||
|
@@ -183,6 +186,22 @@ describe('ParseFile', () => { | |
expect(a.equals(b)).toBe(false); | ||
expect(b.equals(a)).toBe(false); | ||
}); | ||
|
||
it('reports progress during save when source is a File', () => { | ||
const file = new ParseFile('progress.txt', new File(["Parse"], "progress.txt")); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @acinader /* global File */ is for the |
||
|
||
const options = { | ||
progress: function(){} | ||
}; | ||
jest.spyOn(options, 'progress'); | ||
|
||
return file.save(options).then(function(f) { | ||
expect(options.progress).toHaveBeenCalledWith(0.5); | ||
expect(f).toBe(file); | ||
expect(f.name()).toBe('progress.txt'); | ||
expect(f.url()).toBe('http://files.parsetfss.com/a/progress.txt'); | ||
}); | ||
}); | ||
}); | ||
|
||
describe('FileController', () => { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what's this?