diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-10-15 13:24:37 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-10-21 06:37:13 +0000 |
| commit | f3f89d66b1792ef862342aaee3366575713987ce (patch) | |
| tree | 689cba99d21c726cd5fe2b16ecbf1572be2bb12c /uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java | |
| parent | 28570bb979f408c474745bf15afb5b66ede37cf4 (diff) | |
| download | vaadin-framework-f3f89d66b1792ef862342aaee3366575713987ce.tar.gz vaadin-framework-f3f89d66b1792ef862342aaee3366575713987ce.zip | |
Update atmosphere-runtime to 2.1.2.vaadin6. (#14674, #14861)
Change-Id: Ie239bf110909f8acb47f2141431965061f9ac407
Diffstat (limited to 'uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java')
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java index d6eed3e5c8..ebcb02002e 100644 --- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java +++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java @@ -40,6 +40,16 @@ import org.openqa.selenium.remote.DesiredCapabilities; */ public abstract class MultiBrowserTest extends PrivateTB3Configuration { + protected List<DesiredCapabilities> getBrowsersSupportingWebSocket() { + List<DesiredCapabilities> browsers = new ArrayList<DesiredCapabilities>(getAllBrowsers()); + + browsers.remove(Browser.IE8.getDesiredCapabilities()); + browsers.remove(Browser.IE9.getDesiredCapabilities()); + browsers.remove(Browser.PHANTOMJS.getDesiredCapabilities()); + + return browsers; + } + protected List<DesiredCapabilities> getBrowsersExcludingPhantomJS() { List<DesiredCapabilities> browsers = new ArrayList<DesiredCapabilities>(getAllBrowsers()); |