diff options
| author | Aleksi Hietanen <aleksi@vaadin.com> | 2016-11-29 15:37:56 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2016-12-09 09:39:00 +0200 |
| commit | 266be8f529c27d6e5f46f2dd15d253584b7ccfbb (patch) | |
| tree | 7e6919325b16e35675c1b58d774712891e476dc6 | |
| parent | 5ad67a15e8c06d35f7c77ccacb54c237240dc1c3 (diff) | |
| download | vaadin-framework-266be8f529c27d6e5f46f2dd15d253584b7ccfbb.tar.gz vaadin-framework-266be8f529c27d6e5f46f2dd15d253584b7ccfbb.zip | |
Fix some modern browsers tests failures.
Change-Id: I2a89d3493e2f98ab1b9a0666d9dc075a2457e432
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java | 3 | ||||
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/components/flash/FlashIsVisibleTest.java | 5 |
2 files changed, 6 insertions, 2 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 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 |