1 files changed, 21 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/components/datefield/LocaleChangeTest.java b/uitest/src/com/vaadin/tests/components/datefield/LocaleChangeTest.java
index cf756034a1..c80a74599d 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/LocaleChangeTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/LocaleChangeTest.java
@@ -34,7 +34,7 @@ public class LocaleChangeTest extends MultiBrowserTest {
         assertPopupOpen(true);
 
         // Close the popup and change the locale.
-        toggleDatePopup();
+        toggleDatePopupWorkaroundClosePopupIE();
         assertPopupOpen(false);
         driver.findElement(By.className("v-button")).click(); // Locale change.
 
@@ -55,6 +55,26 @@ public class LocaleChangeTest extends MultiBrowserTest {
         driver.findElement(By.className("v-datefield-button")).click();
     }
 
+    /*
+     * Work around bug reported in ticket #14086. Delete this method once fixed
+     * andd use toggleDatePopup() instead.
+     */
+    private void toggleDatePopupWorkaroundClosePopupIE() {
+        if (!BrowserUtil.isIE(getDesiredCapabilities())) {
+            driver.findElement(By.className("v-datefield-button")).click();
+        } else {
+            boolean popupOpen = driver.findElements(
+                    By.className("v-datefield-popup")).size() == 1;
+            if (popupOpen) {
+                driver.findElement(
+                        By.className("v-datefield-calendarpanel-day-selected"))
+                        .click();
+            } else {
+                driver.findElement(By.className("v-datefield-button")).click();
+            }
+        }
+    }
+
     private String getDateValue() {
         return driver.findElement(By.className("v-datefield-textfield"))
                 .getAttribute("value");