fix: interrupt all uploads (CP: 23.6) #7619
Merged
Conversation
This file contains hidden or 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
sissbruecker
commented
Jun 18, 2025
| * @return The generated temp file handle with the provided extension | ||
| * @throws IOException | ||
| */ | ||
| File createTempFile(String extension) throws IOException { |
There was a problem hiding this comment.
Added an overload to allow passing a file extension
Comment on lines
134
to
139
| private void waitForUploads(int maxSeconds) { | ||
| Timeouts timeouts = getDriver().manage().timeouts(); | ||
| timeouts.scriptTimeout(Duration.of(15, ChronoUnit.SECONDS)); | ||
|
|
||
| String script = "var callback = arguments[arguments.length - 1];" | ||
| + "var upload = arguments[0];" | ||
| + "window.setTimeout(function() {" | ||
| + " var inProgress = upload.files.filter(function(file) { return file.uploading;}).length >0;" | ||
| + " if (!inProgress) callback();" // | ||
| + "}, 500);"; | ||
| getCommandExecutor().getDriver().executeAsyncScript(script, this); | ||
| String script = "return arguments[0].files.every((file) => !file.uploading);"; | ||
|
|
||
| waitUntil(driver -> (Boolean) executeScript(script, UploadElement.this), | ||
| maxSeconds); | ||
| } |
There was a problem hiding this comment.
This wasn't working reliably, replaced it with the logic we have in newer versions
|
mcollovati
approved these changes
Jun 18, 2025
|
This ticket/PR has been released with Vaadin 23.6.1. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cherry-pick of #7616