summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@gmail.com>2017-02-14 09:33:16 +0200
committerHenri Sara <henri.sara@gmail.com>2017-02-14 13:45:58 +0200
commitf338718b493b6ab6ff9c0584c19824717e88c844 (patch)
tree1379e142f78ef6313775cd97bcf5a1701c96e8f8
parent3c02e139905ad423f6cf9398f85f6a05b90ca09b (diff)
downloadvaadin-framework-f338718b493b6ab6ff9c0584c19824717e88c844.tar.gz
vaadin-framework-f338718b493b6ab6ff9c0584c19824717e88c844.zip
Fix PopupDateFieldExtendedRangeTest for Firefox (#8555)
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
index d804f8f8ce..980116ea6d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
@@ -343,7 +343,8 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
new Actions(driver).keyUp(Keys.SHIFT).perform();
// TODO: remove this once #14406 has been fixed
- if (BrowserUtil.isIE(getDesiredCapabilities())) {
+ if (BrowserUtil.isIE(getDesiredCapabilities())
+ || BrowserUtil.isFirefox(getDesiredCapabilities())) {
popup.findElement(
By.className("v-datefield-calendarpanel-prevmonth"))
.findElement(By.tagName("button")).click();
@@ -366,7 +367,8 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
.size());
// TODO: remove this check once #14406 has been fixed -- clicking the
// button instead of navigating with arrow keys steals the focus
- if (!BrowserUtil.isIE(getDesiredCapabilities())) {
+ if (!BrowserUtil.isIE(getDesiredCapabilities())
+ && !BrowserUtil.isFirefox(getDesiredCapabilities())) {
assertEquals("unexpected focus", "16",
popup.findElement(By
.className("v-datefield-calendarpanel-day-focused"))