diff options
| author | Chris Rebert <[email protected]> | 2014-03-16 20:30:04 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-03-16 20:30:50 -0700 |
| commit | 96525fdec431f8d654ce0ea9b4f92c2a3ef9104b (patch) | |
| tree | 8c1382f7e567c99390151ff5e69311adc14d80be | |
| parent | 7cf7e42c67d51d9db50f8461d629d06bc0a7f331 (diff) | |
| download | bootstrap-96525fdec431f8d654ce0ea9b4f92c2a3ef9104b.tar.xz bootstrap-96525fdec431f8d654ce0ea9b4f92c2a3ef9104b.zip | |
move sauce_browsers.yml into /grunt/; fixes #13065
| -rw-r--r-- | Gruntfile.js | 2 | ||||
| -rw-r--r-- | bower.json | 3 | ||||
| -rw-r--r-- | grunt/sauce_browsers.yml (renamed from test-infra/sauce_browsers.yml) | 0 |
3 files changed, 3 insertions, 2 deletions
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/test-infra/sauce_browsers.yml b/grunt/sauce_browsers.yml index 4c1e011d3..4c1e011d3 100644 --- a/test-infra/sauce_browsers.yml +++ b/grunt/sauce_browsers.yml |