diff options
Diffstat (limited to 'uitest')
3 files changed, 15 insertions, 3 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java b/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java index 2aca0b91f2..5cc3c02016 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java @@ -15,11 +15,13 @@ */ package com.vaadin.tests.components.window; +import com.vaadin.annotations.Theme; +import com.vaadin.annotations.Widgetset; import com.vaadin.navigator.Navigator; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractReindeerTestUI; +import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; @@ -27,7 +29,9 @@ import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class BackspaceKeyWithModalOpened extends AbstractReindeerTestUI { +@Theme("valo") +@Widgetset("com.vaadin.DefaultWidgetSet") +public class BackspaceKeyWithModalOpened extends AbstractTestUI { private static final String DEFAULT_VIEW_ID = ""; private static final String SECOND_VIEW_ID = "second"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java index a9578840d2..9e77600213 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java @@ -15,12 +15,14 @@ */ package com.vaadin.tests.components.window; +import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Window; +@Widgetset("com.vaadin.DefaultWidgetSet") public class ModalWindowFocus extends AbstractReindeerTestUI { @Override diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java index ce015bab9d..b9199e0aec 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java @@ -22,6 +22,7 @@ import static org.openqa.selenium.Keys.BACK_SPACE; import static org.openqa.selenium.Keys.TAB; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; @@ -60,9 +61,14 @@ public class BackspaceKeyWithModalOpenedTest extends MultiBrowserTest { } /** - * Tests that backspace action in the bottom component is prevented + * Tests that backspace action in the bottom component is prevented. + * + * Ignored because the fix to #8855 stops the top and bottom components + * from functioning as focus traps. Meanwhile, navigation with Backspace + * is not anymore supported by reasonable browsers. */ @Test + @Ignore public void testWithFocusOnBottom() throws Exception { TextFieldElement textField = getTextField(); |