diff --git a/RELEASE.md b/RELEASE.md index f297aca56..62cdcef76 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -5,6 +5,9 @@ - [ ] Update dependencies to latest version as appropriate - [ ] Test - [ ] `grunt test` + - [ ] `grunt saucelabs` Best to find out if they pass or not now as opposed to in the middle of a release. + * If some environments fail, you can comment out the passing environments temporarily in `sauce_browsers.yml` while you debug + * If some environments fail, start your server with `grunt servefast` and use Browserstack to investigate. - [ ] Generate test distribution package for use on the Fuel UX Site - [ ] `grunt dist` - [ ] Copy the created `dist/` directory to the fuelux-site project, replacing `node_modules/fuelux/dist/` diff --git a/grunt/config/saucelabs-qunit.js b/grunt/config/saucelabs-qunit.js index dafed4567..2e18c388f 100644 --- a/grunt/config/saucelabs-qunit.js +++ b/grunt/config/saucelabs-qunit.js @@ -4,19 +4,6 @@ module.exports = function (grunt) { } return { - trickyBrowsers: { - options: { - username: '<%= sauceUser %>', - key: '<%= sauceKey %>', - tunnelTimeout: 45, - testInterval: 3000, - tags: ['<%= sauceUser %>' + '@' + process.env.TRAVIS_BRANCH || '<%= sauceUser %>' + '@local'], - browsers: grunt.file.readYAML('sauce_browsers_tricky.yml'), - build: process.env.TRAVIS_BUILD_NUMBER || getPackage().version, - testname: process.env.TRAVIS_JOB_ID || Math.floor((new Date()).getTime() / 1000 - 1230768000).toString(), - urls: ['http://localhost:<%= connect.testServer.options.port %>/test/?testdist=true&hidepassed'] - } - }, defaultBrowsers: { options: { username: '<%= sauceUser %>', diff --git a/grunt/tasks/test.js b/grunt/tasks/test.js index 6f3508c1a..6795ff5c0 100644 --- a/grunt/tasks/test.js +++ b/grunt/tasks/test.js @@ -20,10 +20,6 @@ module.exports = function(grunt) { grunt.registerTask('saucelabs', 'run jshint, and qunit on saucelabs', ['connect:testServer', 'jshint', 'saucelabs-qunit:defaultBrowsers']); - // can be run locally instead of through TravisCI, but requires the FuelUX Saucelabs API key file which is not public at this time. - grunt.registerTask('trickysauce', 'run tests, jshint, and qunit for "tricky browsers" (IE8-11)', - ['connect:testServer', 'jshint', 'saucelabs-qunit:trickyBrowsers']); - // Travis CI task. This task no longer uses SauceLabs. Please run 'grunt saucelabs' manually. grunt.registerTask('travisci', 'Tests to run when in Travis CI environment', ['test', 'dist', 'browserify:commonjs', 'qunit:dist']); diff --git a/sauce_browsers.yml b/sauce_browsers.yml index 158809f7a..e83233935 100644 --- a/sauce_browsers.yml +++ b/sauce_browsers.yml @@ -1,6 +1,8 @@ [ # Docs: https://saucelabs.com/docs/platforms/webdriver + # If you are having trouble with a particular test, you can comment the others out to test just it + { browserName: "safari", platform: "OS X 10.9" @@ -32,12 +34,7 @@ platform: "Windows 7" }, - # Not Supported by MC - # { - # browserName: "internet explorer", - # version: "8", - # platform: "Windows 7" - # }, + # Windows 7, IE 8 Not Supported by MC { browserName: "chrome", @@ -70,9 +67,4 @@ # Android Chrome not currently supported by Sauce Labs - # { # Android Browser (super-unofficial) - # browserName: "android", - # version: "4.0", - # platform: "Linux" - # } ] diff --git a/sauce_browsers_tricky.yml b/sauce_browsers_tricky.yml deleted file mode 100644 index 0e499fa50..000000000 --- a/sauce_browsers_tricky.yml +++ /dev/null @@ -1,88 +0,0 @@ -[ - # Docs: https://saucelabs.com/docs/platforms/webdriver - - # { - # browserName: "internet explorer", - # version: "8", - # platform: "Windows XP" - # }, - - # { - # browserName: "googlechrome", - # version: "31", - # platform: "Windows 7" - # }, - - { - browserName: "internet explorer", - version: "9", - platform: "Windows 7" - }, - - # Linux (unofficial) - # { - # browserName: "googlechrome", - # platform: "Linux", - # version: "31" - # }, - { - browserName: "firefox", - platform: "Linux" - }, - - #{ - # browserName: "firefox", - # version: "28", - # platform: "Windows 7" - #}, - - { - browserName: "internet explorer", - version: "10", - platform: "Windows 8" - }, - - { - browserName: "internet explorer", - version: "11", - platform: "Windows 8.1" - }, - - # { - # browserName: "safari", - # version: "6", - # platform: "OS X 10.8" - # }, - - { - browserName: "iphone", - version: "7", - platform: "OS X 10.9" - }, - - { - browserName: "internet explorer", - version: "8", - platform: "Windows 7" - } - - # # this was probably what it was built on, no? - # # { - # # browserName: "googlechrome", - # # platform: "OS X 10.9", - # # }, - - # Mac Opera not currently supported by Sauce Labs - - # { # Unofficial - # browserName: "internet explorer", - # version: "7", - # platform: "Windows XP" - # }, - - # { - # browserName: "firefox", - # platform: "OS X 10.9", - # version: "28" - # }, -] \ No newline at end of file