Skip to content

Commit

Permalink
Compact browser list, skip FF and IE
Browse files Browse the repository at this point in the history
  • Loading branch information
jforbes committed May 15, 2015
1 parent 5564f3f commit ad92b6e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 20 deletions.
2 changes: 1 addition & 1 deletion build/tasks/test-travis.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function(grunt) {
if (!process.env.SAUCE_ACCESS_KEY) {
grunt.task.run(['karma:firefox']);
} else {
grunt.task.run([ 'connect:dev', 'saucelabs-qunit' ]);
grunt.task.run(['connect:dev', 'saucelabs-qunit']);
}
});
};
30 changes: 11 additions & 19 deletions grunt.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,25 +185,17 @@ module.exports = function(grunt) {
'saucelabs-qunit': {
all: {
options: {
urls: [ 'http://127.0.0.1:9999/test/index.html' ],
browsers: [{
browserName: 'chrome',
platform: 'WIN8.1'
}, {
browserName: 'firefox',
platform: 'Linux'
}, {
browserName: 'safari',
platform: 'OS X 10.10'
}, {
browserName: 'iPad',
version: '8.2'
}, {
browserName: 'Android'
}, {
browserName: 'internet explorer',
platform: 'WIN8.1'
}],
urls: ['http://127.0.0.1:9999/test/index.html'],
browsers: [
/* [platform, browserName, version] - version will default to latest stable version */
['WIN8.1', 'chrome', ''],
// TODO: Find out and fix IE and FF on Linux timeouts
// ['Linux', 'firefox', ''],
// ['WIN8.1', 'internet explorer', ''],
['OS X 10.10', 'safari', '' ],
['', 'iPad', '8.2'],
['', 'Android', '']
],
tunneled: false,
build: process.env.TRAVIS_BUILD_NUMBER,
testname: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH,
Expand Down

0 comments on commit ad92b6e

Please sign in to comment.