From 96525fdec431f8d654ce0ea9b4f92c2a3ef9104b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 16 Mar 2014 20:30:04 -0700 Subject: move sauce_browsers.yml into /grunt/; fixes #13065 --- Gruntfile.js | 2 +- bower.json | 3 +- grunt/sauce_browsers.yml | 83 +++++++++++++++++++++++++++++++++++++++++++ test-infra/sauce_browsers.yml | 83 ------------------------------------------- 4 files changed, 86 insertions(+), 85 deletions(-) create mode 100644 grunt/sauce_browsers.yml delete mode 100644 test-infra/sauce_browsers.yml diff --git a/Gruntfile.js b/Gruntfile.js index 7d55f4089..4cfcade9f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -390,7 +390,7 @@ module.exports = function (grunt) { build: process.env.TRAVIS_JOB_ID, concurrency: 10, urls: ['http://127.0.0.1:3000/js/tests/index.html'], - browsers: grunt.file.readYAML('test-infra/sauce_browsers.yml') + browsers: grunt.file.readYAML('grunt/sauce_browsers.yml') } } }, diff --git a/bower.json b/bower.json index 7590d787e..965ed2f1c 100644 --- a/bower.json +++ b/bower.json @@ -26,7 +26,8 @@ "composer.json", "CONTRIBUTING.md", "docs", - "js/tests" + "js/tests", + "test-infra" ], "dependencies": { "jquery": ">= 1.9.0" diff --git a/grunt/sauce_browsers.yml b/grunt/sauce_browsers.yml new file mode 100644 index 000000000..4c1e011d3 --- /dev/null +++ b/grunt/sauce_browsers.yml @@ -0,0 +1,83 @@ +[ + # Docs: https://saucelabs.com/docs/platforms/webdriver + + { + browserName: "safari", + platform: "OS X 10.9" + }, + # { + # browserName: "chrome", + # platform: "OS X 10.9", + # version: "31" + # }, + { + browserName: "firefox", + platform: "OS X 10.9" + }, + + # Mac Opera not currently supported by Sauce Labs + + { + 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", + platform: "Windows 8.1" + }, + { + browserName: "firefox", + platform: "Windows 8.1" + }, + + # Win Opera 15+ not currently supported by Sauce Labs + + { + browserName: "iphone", + platform: "OS X 10.9", + version: "7" + }, + + # iOS Chrome not currently supported by Sauce Labs + + # Linux (unofficial) + { + browserName: "chrome", + platform: "Linux" + }, + { + browserName: "firefox", + platform: "Linux" + } + + # Android Chrome not currently supported by Sauce Labs + + # { # Android Browser (super-unofficial) + # browserName: "android", + # version: "4.0", + # platform: "Linux" + # } +] diff --git a/test-infra/sauce_browsers.yml b/test-infra/sauce_browsers.yml deleted file mode 100644 index 4c1e011d3..000000000 --- a/test-infra/sauce_browsers.yml +++ /dev/null @@ -1,83 +0,0 @@ -[ - # Docs: https://saucelabs.com/docs/platforms/webdriver - - { - browserName: "safari", - platform: "OS X 10.9" - }, - # { - # browserName: "chrome", - # platform: "OS X 10.9", - # version: "31" - # }, - { - browserName: "firefox", - platform: "OS X 10.9" - }, - - # Mac Opera not currently supported by Sauce Labs - - { - 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", - platform: "Windows 8.1" - }, - { - browserName: "firefox", - platform: "Windows 8.1" - }, - - # Win Opera 15+ not currently supported by Sauce Labs - - { - browserName: "iphone", - platform: "OS X 10.9", - version: "7" - }, - - # iOS Chrome not currently supported by Sauce Labs - - # Linux (unofficial) - { - browserName: "chrome", - platform: "Linux" - }, - { - browserName: "firefox", - platform: "Linux" - } - - # Android Chrome not currently supported by Sauce Labs - - # { # Android Browser (super-unofficial) - # browserName: "android", - # version: "4.0", - # platform: "Linux" - # } -] -- cgit v1.2.3