diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-03-04 17:02:22 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2015-03-04 17:06:09 +0200 |
| commit | 6904a5a53301f21bb89f40200a4c1d3d6b6ce009 (patch) | |
| tree | 531397e8edd5c885426cb0d547b9e04660ad660c /uitest/src/com/vaadin/tests/components/javascriptcomponent | |
| parent | 6e7603f448ad63426e7e5ebbc84dc0133395ce43 (diff) | |
| download | vaadin-framework-6904a5a53301f21bb89f40200a4c1d3d6b6ce009.tar.gz vaadin-framework-6904a5a53301f21bb89f40200a4c1d3d6b6ce009.zip | |
Use TestBench-4.0.2
- Based on TB4 Parallel testing.
- Browser setup no longer uses static capabilities.
- Some code cleanup here and there.
Change-Id: I5c419316cd36f4f5041eaa8da8fda3d8b46596c4
Diffstat (limited to 'uitest/src/com/vaadin/tests/components/javascriptcomponent')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java b/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java index a9e7a1bca7..4009365814 100644 --- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java +++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java @@ -29,23 +29,11 @@ import org.openqa.selenium.support.ui.WebDriverWait; import com.vaadin.tests.tb3.MultiBrowserTest; -/** - * - * @since - * @author Vaadin Ltd - */ public class JavaScriptPreloadingTest extends MultiBrowserTest { - /* - * (non-Javadoc) - * - * @see com.vaadin.tests.tb3.MultiBrowserTest#getBrowsersToTest() - */ @Override public List<DesiredCapabilities> getBrowsersToTest() { - List<DesiredCapabilities> browsers = super.getBrowsersToTest(); - browsers.remove(Browser.PHANTOMJS.getDesiredCapabilities()); - return browsers; + return getBrowsersExcludingPhantomJS(); } @Test |