diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-07-16 18:04:20 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-07-17 06:58:12 +0000 |
| commit | 23abf1d905eca80ad36e20d2de13203b98e23ac7 (patch) | |
| tree | a68a5d775831476766c6a070c1c97896c88b7636 /uitest | |
| parent | 1c463a0229c408cb627da5dbee4660d4a5e50217 (diff) | |
| download | vaadin-framework-23abf1d905eca80ad36e20d2de13203b98e23ac7.tar.gz vaadin-framework-23abf1d905eca80ad36e20d2de13203b98e23ac7.zip | |
Stabilize Grid tests on IE11
Change-Id: I1e16dfe54a369c5ed18dedd8755ff479bc1617a1
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java | 5 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/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( |