-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: set maxFiles to Infinity when setting a MultiFileReceiver (#6253) (
#6303) Co-authored-by: Sergey Vinogradov <mr.vursen@gmail.com>
- Loading branch information
1 parent
6650259
commit a66ade3
Showing
4 changed files
with
126 additions
and
3 deletions.
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