-
Notifications
You must be signed in to change notification settings - Fork 64
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
fix: set maxFiles to Infinity when setting a MultiFileReceiver #6253
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
60df657
fix: set maxFiles to Infinity when setting multi file receiver
vursen 04b5607
add integration tests
vursen 6893ad6
revert unnecessary changes
vursen 05faf94
add unit tests
vursen bdef919
Merge branch 'main' into upload/remove-max-files-correctly
vursen 0d4245e
remove unnecessary statement
vursen 325fa70
simplify tests
vursen c2d1df0
Merge branch 'main' into upload/remove-max-files-correctly
vursen f84dee3
Merge branch 'main' into upload/remove-max-files-correctly
vursen 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
50 changes: 50 additions & 0 deletions
50
...ation-tests/src/main/java/com/vaadin/flow/component/upload/tests/SwitchReceiversPage.java
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 |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
* Copyright 2000-2024 Vaadin Ltd. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
* use this file except in compliance with the License. You may obtain a copy of | ||
* the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
* | ||
*/ | ||
package com.vaadin.flow.component.upload.tests; | ||
|
||
import com.vaadin.flow.component.html.NativeButton; | ||
|
||
import com.vaadin.flow.component.html.Div; | ||
import com.vaadin.flow.component.upload.Upload; | ||
import com.vaadin.flow.component.upload.receivers.MemoryBuffer; | ||
import com.vaadin.flow.component.upload.receivers.MultiFileMemoryBuffer; | ||
import com.vaadin.flow.router.Route; | ||
|
||
@Route("vaadin-upload/switch-receivers") | ||
public class SwitchReceiversPage extends Div { | ||
|
||
public SwitchReceiversPage() { | ||
Upload upload = new Upload(); | ||
|
||
NativeButton setSingleFileReceiver = new NativeButton( | ||
"Set single file receiver", event -> { | ||
MemoryBuffer buffer = new MemoryBuffer(); | ||
upload.setReceiver(buffer); | ||
}); | ||
setSingleFileReceiver.setId("set-single-file-receiver"); | ||
|
||
NativeButton setMultiFileReceiver = new NativeButton( | ||
"Set multi file receiver", event -> { | ||
MultiFileMemoryBuffer buffer = new MultiFileMemoryBuffer(); | ||
upload.setReceiver(buffer); | ||
}); | ||
setMultiFileReceiver.setId("set-multi-file-receiver"); | ||
|
||
add(upload, setSingleFileReceiver, setMultiFileReceiver); | ||
} | ||
|
||
} |
54 changes: 54 additions & 0 deletions
54
...gration-tests/src/test/java/com/vaadin/flow/component/upload/tests/SwitchReceiversIT.java
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 |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/* | ||
* Copyright 2000-2024 Vaadin Ltd. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
* use this file except in compliance with the License. You may obtain a copy of | ||
* the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package com.vaadin.flow.component.upload.tests; | ||
|
||
import org.junit.Assert; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
|
||
import com.vaadin.flow.component.upload.testbench.UploadElement; | ||
import com.vaadin.flow.testutil.TestPath; | ||
|
||
@TestPath("vaadin-upload/switch-receivers") | ||
public class SwitchReceiversIT extends AbstractUploadIT { | ||
|
||
private UploadElement upload; | ||
|
||
@Before | ||
public void init() { | ||
open(); | ||
upload = $(UploadElement.class).first(); | ||
} | ||
|
||
@Test | ||
public void switchBetweenSingleAndMultiFileReceiver_assertMaxFilesProperty() { | ||
$("button").id("set-single-file-receiver").click(); | ||
Assert.assertEquals( | ||
"The maxFiles property should equal 1 when single file receiver is set", | ||
1, (int) upload.getPropertyInteger("maxFiles")); | ||
|
||
$("button").id("set-multi-file-receiver").click(); | ||
Assert.assertTrue( | ||
"The maxFiles property should equal Infinity when multi file receiver is set", | ||
(boolean) executeScript( | ||
"return arguments[0].maxFiles === Infinity", upload)); | ||
|
||
$("button").id("set-single-file-receiver").click(); | ||
Assert.assertEquals( | ||
"The maxFiles property should equal 1 when single file receiver is set", | ||
1, (int) upload.getPropertyInteger("maxFiles")); | ||
} | ||
} |
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.
Should we rather change the default value for this property in the web component?
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.
We discussed this internally and decided to go ahead with the current fix for now. We will consider changing the web component's default values later.