Make test stable in IE11

Change-Id: Iac16310af8bde98caa78bec4763b78919ef8371d

3 files changed, 26 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/application/CriticalNotificationsTest.java b/uitest/src/com/vaadin/tests/application/CriticalNotificationsTest.java
index 03564cbaf7..6115937054 100644
--- a/uitest/src/com/vaadin/tests/application/CriticalNotificationsTest.java
+++ b/uitest/src/com/vaadin/tests/application/CriticalNotificationsTest.java
@@ -24,6 +24,11 @@ import com.vaadin.tests.tb3.MultiBrowserThemeTest;
 
 public class CriticalNotificationsTest extends MultiBrowserThemeTest {
 
+    @Override
+    protected boolean useNativeEventsForIE11() {
+        return false;
+    }
+
     @Test
     public void internalError() throws Exception {
         testCriticalNotification("Internal error");
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 5ca945c860..00b861f705 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -904,6 +904,19 @@ public abstract class AbstractTB3Test extends ParallelTest {
         return true;
     }
 
+    /**
+     * Should the "native events" be enabled for Internet Explorer 11.
+     * <p>
+     * Native events sometimes cause failure in clicking on buttons/checkboxes
+     * but are possibly needed for some operations.
+     * 
+     * @return true, to use "native events", false to use generated Javascript
+     *         events
+     */
+    protected boolean useNativeEventsForIE11() {
+        return true;
+    }
+
     // FIXME: Remove this once TB4 getRemoteControlName works properly
     private RemoteWebDriver getRemoteDriver() {
         WebDriver d = getDriver();
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
index 23ead80fce..fe2c12e8af 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -96,6 +96,14 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
                         InternetExplorerDriver.ENABLE_PERSISTENT_HOVERING,
                         false);
             }
+            if (BrowserUtil.isIE(desiredCapabilities, 11)) {
+                // Only for IE 11 for now, can be expanded to other versions if
+                // they have the same problems
+                if (!useNativeEventsForIE11()) {
+                    desiredCapabilities.setCapability(
+                            InternetExplorerDriver.NATIVE_EVENTS, false);
+                }
+            }
         }
 
         desiredCapabilities.setCapability("project", "Vaadin Framework");