diff options
| author | Artur Signell <artur@vaadin.com> | 2013-10-31 19:27:40 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-11-01 06:22:32 +0000 |
| commit | c21a6848a2b7327eb0377b44b2479f03fecaf23e (patch) | |
| tree | f50dc478a8334b61de1d5d9dd24911d59364c907 /uitest | |
| parent | 1cc4dc18fab893ab584d4ac3bf8219933369a915 (diff) | |
| download | vaadin-framework-c21a6848a2b7327eb0377b44b2479f03fecaf23e.tar.gz vaadin-framework-c21a6848a2b7327eb0377b44b2479f03fecaf23e.zip | |
Prepare for Safari 7 testing (#5288)
Change-Id: I8868d9bd5e6dcc2b6ece404460700f00e6f2004e
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java | 1 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java index f9df2f0a71..44cf069402 100644 --- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -650,6 +650,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase { */ public static DesiredCapabilities safari(int version) { DesiredCapabilities c = DesiredCapabilities.safari(); + c.setPlatform(Platform.MAC); c.setVersion("" + version); return c; } diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java index 040d0156a3..e8a974343b 100644 --- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java +++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java @@ -40,7 +40,7 @@ import org.openqa.selenium.remote.DesiredCapabilities; */ public abstract class MultiBrowserTest extends PrivateTB3Configuration { - public static final int TESTED_SAFARI_VERSION = 6; + public static final int TESTED_SAFARI_VERSION = 7; public static final int TESTED_CHROME_VERSION = 29; public static final int TESTED_FIREFOX_VERSION = 24; @@ -52,7 +52,7 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration { allBrowsers.add(BrowserUtil.ie(11)); allBrowsers.add(BrowserUtil.firefox(TESTED_FIREFOX_VERSION)); // Uncomment once we have the capability to run on Safari 6 - // allBrowsers.add(safari(TESTED_SAFARI_VERSION)); + // allBrowsers.add(BrowserUtil.safari(TESTED_SAFARI_VERSION)); allBrowsers.add(BrowserUtil.chrome(TESTED_CHROME_VERSION)); // Re-enable this when it is possible to run on a modern Opera version // (15+) |