diff options
| author | Henri Sara <hesara@vaadin.com> | 2015-12-15 15:41:53 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-12-15 14:16:05 +0000 |
| commit | 61e83653330399f6ead49f74277410e43368a2cb (patch) | |
| tree | 42b7329e965b1352162abb9e447f35d213003901 /uitest | |
| parent | 899f45bb45d61b9c1738dbdf9a530aa6a2c9ee12 (diff) | |
| download | vaadin-framework-61e83653330399f6ead49f74277410e43368a2cb.tar.gz vaadin-framework-61e83653330399f6ead49f74277410e43368a2cb.zip | |
Fix LegacyComponentThemeChangeTest on Chrome 47
The test uses an Embedded component with non-existent Flash content.
This does not work on Chrome 47 so this change disables that part
of the test on Chrome like it was already disabled on IE8.
Change-Id: Ie60123247ec45b2138202fccd73d794bf98e533e
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java index 8062fdbf39..1814aa99df 100644 --- a/uitest/src/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java +++ b/uitest/src/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java @@ -72,8 +72,9 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest { } private void assertEmbeddedTheme(String theme) { - if (BrowserUtil.isIE8(getDesiredCapabilities())) { - // IE8 won't initialize the dummy flash properly + if (BrowserUtil.isIE8(getDesiredCapabilities()) + || BrowserUtil.isChrome(getDesiredCapabilities())) { + // IE8 and Chrome 47 won't initialize the dummy flash properly return; } EmbeddedElement e = $(EmbeddedElement.class).first(); |