Skip to content

fix: fix support for modality in MockedUI #2013

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 30, 2025
Merged

fix: fix support for modality in MockedUI #2013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions ...estbench-unit-junit5/src/test/java/com/vaadin/flow/component/dialog/DialogTesterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import com.vaadin.flow.component.ModalityMode;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonTester;
import com.vaadin.flow.router.RouteConfiguration;
Expand Down Expand Up @@ -56,7 +57,17 @@ void programmaticallyClose_dialogIsDetached() {
}

@Test
void modalDialog_blocksUIComponents() {
void modalDialog_visual_doNotBlockUIComponents() {
view.dialog.setModality(ModalityMode.VISUAL);
dialog_.open();
ButtonTester<Button> button_ = test(view.button);
Assertions.assertTrue(button_.isUsable(),
"Default VISUAL modal dialog should not block button");
}

@Test
void modalDialog_strict_blocksUIComponents() {
view.dialog.setModality(ModalityMode.STRICT);
dialog_.open();
ButtonTester<Button> button_ = test(view.button);
Assertions.assertFalse(button_.isUsable(),
Expand All @@ -70,7 +81,7 @@ void modalDialog_blocksUIComponents() {

@Test
void nonModalDialog_UIComponentsUsable() {
view.dialog.setModal(false);
view.dialog.setModality(ModalityMode.MODELESS);
dialog_.open();
ButtonTester<Button> button_ = test(view.button);
Assertions.assertTrue(button_.isUsable(),
Expand Down
7 changes: 4 additions & 3 deletions vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockedUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ package com.vaadin.testbench.unit.mocks

import com.vaadin.flow.component.Component
import com.vaadin.flow.component.ComponentEventListener
import com.vaadin.flow.component.ModalityMode
import com.vaadin.flow.component.UI
import com.vaadin.flow.shared.Registration
import java.util.concurrent.atomic.AtomicReference
Expand All @@ -26,9 +27,9 @@ import com.vaadin.testbench.unit.internal.simulateClosedEvent
*/
open class MockedUI : UI() {

override fun setChildComponentModal(childComponent: Component?, modal: Boolean) {
super.setChildComponentModal(childComponent, modal)
if (modal) {
override fun setChildComponentModal(childComponent: Component?, mode: ModalityMode) {
super.setChildComponentModal(childComponent, mode)
if (mode != ModalityMode.MODELESS) {
val registrationCombination: AtomicReference<Registration?> = AtomicReference<Registration?>()
registrationCombination.set(childComponent?.addDetachListener(ComponentEventListener {
roundTrip()
Expand Down