diff options
| author | Chris Rebert <[email protected]> | 2013-12-16 00:43:21 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2013-12-16 00:43:21 -0800 |
| commit | 94635eb9723444ad69b00d33c96e129c1996b013 (patch) | |
| tree | cbbf6b4b589623f1bb806f23cbf9e2b0b334e49a /Gruntfile.js | |
| parent | 2ae39d716651be9c7bddfa6deeb7300a038afbaa (diff) | |
| parent | 0f72123c43bad7db4e7ea1c163043c34707e6aa4 (diff) | |
| download | bootstrap-94635eb9723444ad69b00d33c96e129c1996b013.tar.xz bootstrap-94635eb9723444ad69b00d33c96e129c1996b013.zip | |
Merge pull request #11893 from twbs/separate-browsers-file
move Sauce test browsers list out of Gruntfile into separate file
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 85 |
1 files changed, 1 insertions, 84 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index d350ce3ad..1a0531b9f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -238,90 +238,7 @@ module.exports = function (grunt) { build: process.env.TRAVIS_JOB_ID, concurrency: 3, urls: ['http://127.0.0.1:3000/js/tests/index.html'], - browsers: [ - // See https://saucelabs.com/docs/platforms/webdriver - { - browserName: 'safari', - version: '7', - platform: 'OS X 10.9' - }, - { - browserName: 'chrome', - version: '31', - platform: 'OS X 10.9' - }, - /* FIXME: currently fails 1 tooltip test - { - browserName: 'firefox', - version: '25', - platform: 'OS X 10.6' - },*/ - // 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: '10', - platform: 'Windows 8' - }, - { - browserName: 'internet explorer', - version: '9', - platform: 'Windows 7' - }, - { - browserName: 'internet explorer', - version: '8', - platform: 'Windows 7' - }, - {// unofficial - browserName: 'internet explorer', - version: '7', - platform: 'Windows XP' - }, - */ - { - browserName: 'chrome', - version: '31', - platform: 'Windows 8.1' - }, - { - browserName: 'firefox', - version: '25', - platform: 'Windows 8.1' - }, - // Win Opera 15+ not currently supported by Sauce Labs - { - browserName: 'iphone', - version: '6.1', - platform: 'OS X 10.8' - }, - // iOS Chrome not currently supported by Sauce Labs - // Linux (unofficial) - { - browserName: 'chrome', - version: '30', - platform: 'Linux' - }, - { - browserName: 'firefox', - version: '25', - platform: 'Linux' - } - // Android Chrome not currently supported by Sauce Labs - /* Android Browser (super-unofficial) - { - browserName: 'android', - version: '4.0', - platform: 'Linux' - } - */ - ], + browsers: grunt.file.readYAML('sauce_browsers.yml') } } } |
