diff options
| author | Mark Otto <[email protected]> | 2014-01-16 20:00:36 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-16 20:00:36 -0800 |
| commit | 8eef0a47eec5db062609eeef72f46857bba099e0 (patch) | |
| tree | b5c68e8fd21b8f5128f371a62d856c29550c83e7 | |
| parent | 380019ccb28ef1205e0a114e386ab2cc4281efb4 (diff) | |
| parent | bd8ef99028de09363df72cf25887abe73f7ac346 (diff) | |
| download | bootstrap-8eef0a47eec5db062609eeef72f46857bba099e0.tar.xz bootstrap-8eef0a47eec5db062609eeef72f46857bba099e0.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | test-infra/sauce_browsers.yml | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/test-infra/sauce_browsers.yml b/test-infra/sauce_browsers.yml index a2edd8b7b..ea5404597 100644 --- a/test-infra/sauce_browsers.yml +++ b/test-infra/sauce_browsers.yml @@ -3,29 +3,26 @@ { browserName: "safari", - platform: "OS X 10.8" + platform: "OS X 10.9" }, - # { # Safari 7 (which requires Mavericks) is not currently supported by Sauce Labs - # browserName: "safari", + # FIXME: keeps timing out frequently for unknown reasons + # { + # browserName: "chrome", # platform: "OS X 10.9" # }, + { - browserName: "chrome", + browserName: "firefox", platform: "OS X 10.9" }, - # { # FIXME: currently fails 1 tooltip test - # browserName: "firefox", - # platform: "OS X 10.9" - # }, - # Mac Opera not currently supported by Sauce Labs - # { # FIXME: currently fails 1 tooltip test - # browserName: "internet explorer", - # version: "11", - # platform: "Windows 8.1" - # }, + { + browserName: "internet explorer", + version: "11", + platform: "Windows 8.1" + }, # { # browserName: "internet explorer", |