From: Aleksi Hietanen <aleksi@vaadin.com>
Date: Tue, 29 Nov 2016 13:37:56 +0000 (+0200)
Subject: Fix some modern browsers tests failures.
X-Git-Tag: 8.0.0.alpha9~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=266be8f529c27d6e5f46f2dd15d253584b7ccfbb;p=vaadin-framework.git

Fix some modern browsers tests failures.

Change-Id: I2a89d3493e2f98ab1b9a0666d9dc075a2457e432
---

diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
index 840af1e1e7..b3ce673d9f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
@@ -31,7 +31,8 @@ public class EmbeddedWithNullSourceTest extends MultiBrowserTest {
     public List<DesiredCapabilities> getBrowsersToTest() {
         // No Flash on PhantomJS, IE 11 has a timeout issue, looks like a
         // IEDriver problem, not reproduced running locally.
-        return getBrowserCapabilities(Browser.CHROME, Browser.FIREFOX);
+        // Flash is disabled in Chrome.
+        return getBrowserCapabilities(Browser.FIREFOX);
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/flash/FlashIsVisibleTest.java b/uitest/src/test/java/com/vaadin/tests/components/flash/FlashIsVisibleTest.java
index 4a18d4d8a2..dd96bdf386 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/flash/FlashIsVisibleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/flash/FlashIsVisibleTest.java
@@ -12,7 +12,10 @@ public class FlashIsVisibleTest extends MultiBrowserTest {
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
         // FF and PhantomJS fail at Flash and ShiftClick
-        return getBrowsersSupportingShiftClick();
+        List<DesiredCapabilities> capabilities = getBrowsersSupportingShiftClick();
+        // Flash support in Chrome is disabled
+        capabilities.removeAll(getBrowserCapabilities(Browser.CHROME));
+        return capabilities;
     }
 
     @Test