From 9a9d31c96b49e9c4d8341997e8765f3b010ada11 Mon Sep 17 00:00:00 2001
From: Denis Anisimov <denis@vaadin.com>
Date: Wed, 9 Nov 2016 17:25:41 +0200
Subject: Fix some modern browsers tests failures.

Change-Id: I2a89d3493e2f98ab1b9a0666d9dc075a2457e432
---
 .../tests/components/abstractembedded/EmbeddedWithNullSourceTest.java  | 3 ++-
 .../java/com/vaadin/tests/components/flash/FlashIsVisibleTest.java     | 2 +-
 uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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 c97c997231..2cd31573fb 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,8 +31,9 @@ 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.
+        // Flash is disabled in Chrome.
         return getBrowserCapabilities(Browser.IE8, Browser.IE9, Browser.IE10,
-                Browser.CHROME, Browser.FIREFOX);
+                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 4f8d6602fe..defd6367cb 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
@@ -15,7 +15,7 @@ public class FlashIsVisibleTest extends MultiBrowserTest {
         // FF and PhantomJS fail at Flash and ShiftClick
         List<DesiredCapabilities> capabilities = getBrowsersSupportingShiftClick();
         // Flash support in Chrome is disabled
-        capabilities.remove(Browser.CHROME);
+        capabilities.removeAll(getBrowserCapabilities(Browser.CHROME));
         return capabilities;
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
index ad6bc240d4..b299332324 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
@@ -9,11 +9,11 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.ComboBoxElement;
 import com.vaadin.testbench.elements.TableElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
 import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
 import com.vaadin.tests.tb3.newelements.WindowElement;
 
-- 
cgit v1.2.3