diff options
| author | Chris Rebert <[email protected]> | 2014-01-14 20:44:47 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-01-14 20:44:47 -0800 |
| commit | e2a18430f994fc89499be76be1783032e73fd972 (patch) | |
| tree | 400f0c869cffc41434c1b9333beb91f55c1149d7 /Gruntfile.js | |
| parent | c1a81f7bde1b4055d8939871d4dc58d9f99f63e8 (diff) | |
| parent | 3a97697456534d19d5e1e4fe4010822611c786e6 (diff) | |
| download | bootstrap-e2a18430f994fc89499be76be1783032e73fd972.tar.xz bootstrap-e2a18430f994fc89499be76be1783032e73fd972.zip | |
Merge pull request #12213 from twbs/browserstack
tests: run BrowserStack in parallel with Sauce Labs
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 76f60e4d5..2a6e59fc7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -348,6 +348,7 @@ module.exports = function (grunt) { // These plugins provide necessary tasks. require('load-grunt-tasks')(grunt, {scope: 'devDependencies'}); + grunt.loadNpmTasks('browserstack-runner'); // Docs HTML validation task grunt.registerTask('validate-html', ['jekyll', 'validation']); @@ -369,6 +370,12 @@ module.exports = function (grunt) { testSubtasks.push('connect'); testSubtasks.push('saucelabs-qunit'); } + // Only run BrowserStack tests if there's a BrowserStack access key + if (typeof process.env.BROWSERSTACK_KEY !== 'undefined' + // Skip BrowserStack if running a different subset of the test suite + && (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'browserstack-js-unit')) { + testSubtasks.push('browserstack_runner'); + } grunt.registerTask('test', testSubtasks); // JS distribution task. |