From 23abf1d905eca80ad36e20d2de13203b98e23ac7 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Thu, 16 Jul 2015 18:04:20 +0300
Subject: [PATCH] Stabilize Grid tests on IE11

Change-Id: I1e16dfe54a369c5ed18dedd8755ff479bc1617a1
---
 .../grid/basicfeatures/GridColumnHidingTest.java          | 5 ++++-
 .../grid/basicfeatures/client/GridDetailsClientTest.java  | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
index a307aaca16..0717cd84d0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
@@ -870,7 +870,10 @@ public class GridColumnHidingTest extends GridBasicClientFeaturesTest {
         selectMenuPath("Component", "Columns", "Column 0", "Hidable");
         getSidebarOpenButton().click();
         verifySidebarOpened();
-        findElement(By.className("v-app")).click();
+        // Click somewhere far from Grid.
+        new Actions(getDriver())
+                .moveToElement(findElement(By.className("v-app")), 600, 600)
+                .click().perform();
         verifySidebarClosed();
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
index 88158c7f6f..1e4b8a0062 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
@@ -35,8 +35,8 @@ import com.vaadin.shared.ui.grid.ScrollDestination;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.ElementQuery;
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
+import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
 
 public class GridDetailsClientTest extends GridBasicClientFeaturesTest {
 
@@ -112,12 +112,12 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest {
     @Test
     public void errorUpdaterShowsErrorNotification() {
         assertFalse("No notifications should've been at the start",
-                $(NotificationElement.class).exists());
+                $(FixedNotificationElement.class).exists());
 
         toggleDetailsFor(1);
         selectMenuPath(SET_FAULTY_GENERATOR);
 
-        ElementQuery<NotificationElement> notification = $(NotificationElement.class);
+        ElementQuery<FixedNotificationElement> notification = $(FixedNotificationElement.class);
         assertTrue("Was expecting an error notification here",
                 notification.exists());
         notification.first().close();
@@ -131,7 +131,7 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest {
         toggleDetailsFor(1);
 
         selectMenuPath(SET_FAULTY_GENERATOR);
-        $(NotificationElement.class).first().close();
+        $(FixedNotificationElement.class).first().close();
         selectMenuPath(SET_GENERATOR);
 
         assertNotEquals(
-- 
2.39.5