diff options
| author | Rohan Jain <[email protected]> | 2013-07-30 22:11:17 +0530 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2013-08-06 12:24:14 -0700 |
| commit | 093cda244ae8e65b480282ef18427c45e976abab (patch) | |
| tree | 2dcf3ba0d3ed5180e47251a9e5195bd336b87745 | |
| parent | b976956432ccf2e0d6f809da1ca6a9d8e99eb39b (diff) | |
| download | bootstrap-093cda244ae8e65b480282ef18427c45e976abab.tar.xz bootstrap-093cda244ae8e65b480282ef18427c45e976abab.zip | |
Integrate testing with browserstack
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Gruntfile.js | 3 | ||||
| -rw-r--r-- | browserstack.json | 61 | ||||
| -rw-r--r-- | package.json | 1 |
4 files changed, 69 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 2d6cd8f4f..2abe85789 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,8 @@ language: node_js node_js: - 0.8 before_script: - - npm install -g grunt-cli
\ No newline at end of file + - npm install -g grunt-cli +env: + global: + - secure: Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w= + - secure: Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew= diff --git a/Gruntfile.js b/Gruntfile.js index de6db2f3c..de5ab6334 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -125,10 +125,11 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-recess'); + grunt.loadNpmTasks('browserstack-runner'); // Test task. - grunt.registerTask('test', ['jshint', 'qunit']); + grunt.registerTask('test', ['jshint', 'qunit', 'browserstack_runner']); // JS distribution task. grunt.registerTask('dist-js', ['concat', 'uglify']); diff --git a/browserstack.json b/browserstack.json new file mode 100644 index 000000000..c83f1eaf0 --- /dev/null +++ b/browserstack.json @@ -0,0 +1,61 @@ +{ + "username": "--secure--", + "key": "--secure--", + "test_path": "js/tests/index.html", + "browsers": [ + { + "browser": "firefox", + "browser_version": "latest", + "os": "OS X", + "os_version": "Mountain Lion" + }, + { + "browser": "safari", + "browser_version": "latest", + "os": "OS X", + "os_version": "Mountain Lion" + }, + { + "browser": "chrome", + "browser_version": "latest", + "os": "OS X", + "os_version": "Mountain Lion" + }, + { + "browser": "firefox", + "browser_version": "latest", + "os": "Windows", + "os_version": "7" + }, + { + "browser": "chrome", + "browser_version": "latest", + "os": "Windows", + "os_version": "7" + }, + { + "browser": "ie", + "browser_version": "8.0", + "os": "Windows", + "os_version": "XP" + }, + { + "browser": "ie", + "browser_version": "9.0", + "os": "Windows", + "os_version": "7" + }, + { + "browser": "ie", + "browser_version": "10.0", + "os": "Windows", + "os_version": "8" + }, + { + "browser": "ie", + "browser_version": "11.0", + "os": "Windows", + "os_version": "7" + } + ] +} diff --git a/package.json b/package.json index e9e8fd29c..5f1428316 100644 --- a/package.json +++ b/package.json @@ -26,5 +26,6 @@ , "grunt-contrib-qunit": "~0.2.2" , "grunt-contrib-watch": "~0.5.1" , "grunt-recess": "~0.3.3" + , "browserstack-runner": "~0.0.11" } } |