Skip to content

Commit

Permalink
Parallelizes travis tests
Browse files Browse the repository at this point in the history
Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>
  • Loading branch information
chrissrogers committed Jul 21, 2016
1 parent 5445058 commit 33fbc0d
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
13 changes: 11 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cache:
directories:
- $HOME/travis-phantomjs
script:
- make test-sauce
- make test-ci
addons:
artifacts:
paths:
Expand All @@ -19,9 +19,18 @@ addons:
permissions: public-read
env:
global:
- ARTIFACTS_BUCKET=recurly-js
- secure: U0dvpEjblZ3i+knw/cOWWgLvHUz/L9vN7Kv5VKDJ5ydvLy/1Tcueokp4hL7jhu4zwzlJto6MdFG1uKXr97zs+ETV9clYtRFBF/4YlAGs8sQcvPu4BOyH9pUJ77tnNR2ZX62wik9UFl6LmJOBpCjVkp+kh6it44QJm4Zv03Yx47w=
- secure: wrAUnHRseJQrRUqoKWCY/Sw8Wd21kssvYiQ26HpjNc8Q3+uQY6IAMwyyyRRbr65nwHnYrk6KJfSEHYgmQbMeie/3+LseXbDGd9BmWAvujI2ZXNPjFxhSA4gmBvVtT/57fZaCdc8pAnGLb8OwiBSgQN0UJ55Kr59Yjhi3ehBZd1Q=
- secure: jQt9v3zZAKmq774J4TOm8a6Zgxea83faf++RRM3azsgLSz5vLfZK6IH4UiC9SmiMZVTYa87mTA71+IO8Mg0lUDJoF8F3EHB+U957el4fDdGak5OULz6FCh0tME1lsstHi+GJ3GtdJGA1DsC6bUR+DsPB5anZZ+wl3QGdUCJToeY=
- secure: Bv5h9pXMa5O0EdOuN2Dt1n9/+T1dMHimnn6XQb0ozjfwzjfhcPR6eKHkOxDVJ0c1rzne48ql0FK0P42QaCdZpEmy8wUyUTmI1gTMhjILcFbQFk+r9GOwGJsPttLNRS2J9+8u5tEDZjf5LiCnPBjy6vIinK7nlas93xTLTQwNEmI=
- secure: yIrHdkLhWtO37N24cRU71PK80zvkPzlJ1Jm+1MS3C6/icgJ8At1N/UgpBdxuBs1tlJm1O7Ahk+/MhpGWlspx9tCF7Hzw9Rj0xpKhqsvM155zgH582xNPwNebiCr/tmsH2/ELgFBBgC9sCW5luzeKx9nyuedGA4fmD2fK5Phc5EE=
matrix:
- BROWSER=phantom ARTIFACTS_BUCKET=recurly-js
- BROWSER=chrome
- BROWSER=firefox
- BROWSER=safari
- BROWSER=ie_10
- BROWSER=ie_11
- BROWSER=opera
- BROWSER=ios_9_2
- BROWSER=android_5_1
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ build/test.js: $(SRC) $(TESTS)
test: build build/test.js
@$(KARMA) start karma.conf.js

test-sauce: build build/test.js
@$(KARMA) start karma.sauce.conf.js
test-ci: build build/test.js
@$(KARMA) start karma.ci.conf.js

node_modules: package.json
@npm install --silent
Expand Down
35 changes: 13 additions & 22 deletions karma.sauce.conf.js → karma.ci.conf.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
var BROWSER = process.env.BROWSER || 'all';
var staticConfig = require('./karma.conf').staticConfig;
var sauceBrowsers = {
sl_phantom: {
base: 'PhantomJS'
},
sl_chrome: {
base: 'SauceLabs',
browserName: 'chrome',
platform: 'Windows 10'
},

sl_firefox: {
base: 'SauceLabs',
browserName: 'firefox',
platform: 'Windows 10'
},

sl_safari: {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.11'
},

sl_ie_10: {
base: 'SauceLabs',
browserName: 'internet explorer',
Expand All @@ -29,33 +30,15 @@ var sauceBrowsers = {
platform: 'Windows 10',
version: '11'
},

sl_opera: {
base: 'SauceLabs',
browserName: 'opera'
},

sl_ios_8_4: {
base: 'SauceLabs',
browserName: 'iphone',
version: '8.4'
},
sl_ios_9_0: {
base: 'SauceLabs',
browserName: 'iphone',
version: '9.0'
},
sl_ios_9_1: {
base: 'SauceLabs',
browserName: 'iphone',
version: '9.1'
},
sl_ios_9_2: {
base: 'SauceLabs',
browserName: 'iphone',
version: '9.2'
},

sl_android_5_1: {
base: 'SauceLabs',
browserName: 'android',
Expand All @@ -67,7 +50,7 @@ module.exports = function (config) {
config.set(Object.assign({}, staticConfig, {
reporters: ['mocha', 'saucelabs'],
logLevel: config.LOG_INFO,
browsers: ['PhantomJS'].concat(Object.keys(sauceBrowsers)),
browsers: browsers(),
sauceLabs: {
testName: 'Recurly.js tests',
recordVideo: true
Expand All @@ -76,4 +59,12 @@ module.exports = function (config) {
}));
};

function browsers () {
if (BROWSER) {
return ['sl_' + BROWSER];
} else {
return Object.keys(sauceBrowsers);
}
}

var server = require('./test/server');
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"karma-mocha-reporter": "^1.1.3",
"karma-phantomjs-launcher": "^0.2.1",
"karma-phantomjs-shim": "^1.1.2",
"karma-sauce-launcher": "^0.3.0",
"karma-sauce-launcher": "^1.0.0",
"karma-sinon": "^1.0.4",
"karma-source-map-support": "^1.1.0",
"koa": "^1.1.2",
Expand Down

0 comments on commit 33fbc0d

Please sign in to comment.