summaryrefslogtreecommitdiffstats
path: root/uitest/src
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-06-03 12:06:04 +0300
committerVaadin Code Review <review@vaadin.com>2015-06-03 10:51:57 +0000
commitdf0a4ae5bc6f5588827ca877175aaaf33b4671bd (patch)
tree86a136d399a981c4683007cb8da43d3c8d28452b /uitest/src
parent24c6da9ee5c5a7c464a7f3aa849356eb9885cead (diff)
downloadvaadin-framework-df0a4ae5bc6f5588827ca877175aaaf33b4671bd.tar.gz
vaadin-framework-df0a4ae5bc6f5588827ca877175aaaf33b4671bd.zip
Fix GridEditorClientTest focus checks on IE8
Change-Id: I68f63cf521fd81c8b5a384c60d88526365d3c9af
Diffstat (limited to 'uitest/src')
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java5
1 files changed, 4 insertions, 1 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 ec309c17a1..f437589a39 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
@@ -271,7 +271,10 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest {
WebElement focused = getFocusedElement();
- if (BrowserUtil.isIE(getDesiredCapabilities())) {
+ if (BrowserUtil.isIE8(getDesiredCapabilities())) {
+ assertEquals("Focus should be in html", "html",
+ focused.getTagName());
+ } else if (BrowserUtil.isIE(getDesiredCapabilities())) {
assertEquals("Focus should be nowhere", null, focused);
} else {
// GWT menubar loses focus after clicking a menuitem