diff options
author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-05-29 11:20:58 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2015-05-29 11:14:54 +0000 |
commit | 4a79c3c5c5cf14dde6f696a0fe924227d00a0ec5 (patch) | |
tree | e0ed2ab0ced838ea4d7477f23082a7cb8b0acffc | |
parent | d75ad04109dbe5fb77b87009a273282b32fec717 (diff) | |
download | vaadin-framework-4a79c3c5c5cf14dde6f696a0fe924227d00a0ec5.tar.gz vaadin-framework-4a79c3c5c5cf14dde6f696a0fe924227d00a0ec5.zip |
Fix GridEditorClientTest focus checks on IE browsers
Change-Id: I50551d5dd294165445b98be1076cc91aaa3555a0
-rw-r--r-- | uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java index 87b0ba17de..ec309c17a1 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java @@ -35,6 +35,7 @@ import org.openqa.selenium.interactions.Actions; import com.vaadin.shared.ui.grid.GridConstants; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.GridElement.GridEditorElement; +import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest; import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures; @@ -270,8 +271,13 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest { WebElement focused = getFocusedElement(); - // GWT menubar loses focus after clicking a menuitem - assertEquals("Focus should be in body", "body", focused.getTagName()); + if (BrowserUtil.isIE(getDesiredCapabilities())) { + assertEquals("Focus should be nowhere", null, focused); + } else { + // GWT menubar loses focus after clicking a menuitem + assertEquals("Focus should be in body", "body", + focused.getTagName()); + } } protected WebElement getSaveButton() { |