Skip to content

Commit

Permalink
Add more sauce browsers, switch sauce user
Browse files Browse the repository at this point in the history
  • Loading branch information
KidkArolis committed Aug 31, 2015
1 parent 02141db commit 03325ed
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ node_js:
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
script: "npm test && karma start karma.conf-ci.js"
script: "npm test && karma start karma.conf-ci.js"
env:
global:
- SAUCE_USERNAME=cherrytree
30 changes: 27 additions & 3 deletions karma.conf-ci.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,23 @@ var customLaunchers = {
base: 'SauceLabs',
browserName: 'firefox'
},
'SL_Firefox19': {
base: 'SauceLabs',
browserName: 'firefox',
platform: 'Windows XP',
version: '19'
},
'SL_Safari': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.9',
version: '7'
platform: 'OS X 10.10',
version: '8'
},
'SL_IE_8': {
base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows XP',
version: '8'
},
'SL_IE_9': {
base: 'SauceLabs',
Expand All @@ -46,13 +58,25 @@ var customLaunchers = {
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11'
},
'SL_iOS': {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.10',
version: '8.1'
},
'SL_Android': {
base: 'SauceLabs',
browserName: 'android',
platform: 'Linux',
version: '4.0'
}
}

module.exports = function (c) {
c.set(_.extend(config, {
sauceLabs: {
testName: 'Cherrytree Tests'
testName: 'Cherrytree'
},
customLaunchers: customLaunchers,
browsers: Object.keys(customLaunchers),
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"bro-size": "^1.0.0",
"cli-color": "^0.3.3",
"co": "^4.5.1",
"es5-shim": "^4.1.11",
"es6-promise": "^2.0.1",
"istanbul-instrumenter-loader": "^0.1.3",
"jquery": "^2.1.3",
Expand Down Expand Up @@ -70,4 +71,4 @@
"build/**"
]
}
}
}
3 changes: 3 additions & 0 deletions tests/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
let Promise = require('es6-promise').Promise
window.Promise = Promise

// for IE8
require('es5-shim')

// do the webpack thing
let testsContext = require.context('.', true, /Test$/)
testsContext.keys().forEach(testsContext)

0 comments on commit 03325ed

Please sign in to comment.