diff options
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 89e7f42f3..dc301fa27 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -238,13 +238,13 @@ module.exports = function (grunt) { // See https://saucelabs.com/docs/platforms/webdriver { browserName: 'safari', - version: '6', - platform: 'OS X 10.8' + version: '7', + platform: 'OS X 10.9' }, { browserName: 'chrome', - version: '28', - platform: 'OS X 10.6' + version: '31', + platform: 'OS X 10.9' }, /* FIXME: currently fails 1 tooltip test { @@ -331,9 +331,19 @@ module.exports = function (grunt) { grunt.registerTask('validate-html', ['jekyll', 'validation']); // Test task. - var testSubtasks = ['dist-css', 'jshint', 'jscs', 'qunit', 'validate-html']; + var testSubtasks = []; + // Skip core tests if running a different subset of the test suite + if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'core') { + testSubtasks = testSubtasks.concat(['dist-css', 'jshint', 'jscs', 'qunit']); + } + // Skip HTML validation if running a different subset of the test suite + if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'validate-html') { + testSubtasks.push('validate-html'); + } // Only run Sauce Labs tests if there's a Sauce access key - if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined') { + if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined' + // Skip Sauce if running a different subset of the test suite + && (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'sauce-js-unit')) { testSubtasks.push('connect'); testSubtasks.push('saucelabs-qunit'); } |