Skip to content

Commit

Permalink
feat: update deps and add new saucelabs config
Browse files Browse the repository at this point in the history
  • Loading branch information
oieduardorabelo authored and dignifiedquire committed Oct 24, 2016
1 parent 2e8ff42 commit 747a19f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
21 changes: 10 additions & 11 deletions examples/karma.conf-ci.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,22 @@ module.exports = function (config) {
// Browsers to run on Sauce Labs
// Check out https://saucelabs.com/platforms for all browser/OS combos
var customLaunchers = {
'SL_Chrome': {
sl_chrome: {
base: 'SauceLabs',
platform: 'OS X 10.11',
browserName: 'chrome',
customData: {
awesome: true
}
platform: 'Windows 7',
version: '35'
},
'SL_Firefox': {
sl_firefox: {
base: 'SauceLabs',
platform: 'OS X 10.11',
browserName: 'firefox'
browserName: 'firefox',
version: '30'
},
'SL_Edge': {
sl_ie_11: {
base: 'SauceLabs',
platform: 'Windows 10',
browserName: 'microsoftedge'
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11'
}
}

Expand Down
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,28 @@
"author": "Vojta Jina <vojta.jina@gmail.com>",
"dependencies": {
"q": "^1.4.1",
"sauce-connect-launcher": "^0.13.0",
"saucelabs": "^1.0.1",
"wd": "^0.3.4"
"sauce-connect-launcher": "^0.16.0",
"saucelabs": "^1.3.0",
"wd": "^0.4.0"
},
"license": "MIT",
"devDependencies": {
"eslint-config-standard": "^4.4.0",
"eslint-plugin-standard": "^1.3.1",
"grunt": "^0.4.1",
"eslint-config-standard": "^6.0.1",
"eslint-plugin-promise": "2.0.1",
"eslint-plugin-standard": "^2.0.0",
"grunt": "^1.0.1",
"grunt-auto-release": "^0.0.6",
"grunt-bump": "^0.6.0",
"grunt-conventional-changelog": "^5.0.0",
"grunt-conventional-github-releaser": "^0.5.0",
"grunt-eslint": "^17.3.1",
"grunt-karma": "1.x || ^0.12.1",
"grunt-bump": "^0.8.0",
"grunt-conventional-changelog": "^6.1.0",
"grunt-conventional-github-releaser": "^1.0.0",
"grunt-eslint": "^19.0.0",
"grunt-karma": "2.x",
"grunt-npm": "^0.0.2",
"jasmine": "^2.3.2",
"jasmine": "^2.5.2",
"karma": "1.x || ^0.13.11",
"karma-jasmine": "1.x || ^0.3.6",
"karma-sauce-launcher": "1.x || *",
"load-grunt-tasks": "^3.3.0"
"load-grunt-tasks": "^3.5.2"
},
"contributors": [
"Mark Ethan Trostler <mark@zzo.com>",
Expand Down

0 comments on commit 747a19f

Please sign in to comment.