Skip to content

Commit

Permalink
feat(config): add proxy option
Browse files Browse the repository at this point in the history
  • Loading branch information
mattkubej authored and dignifiedquire committed Aug 22, 2017
1 parent e792677 commit bae758a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
5 changes: 5 additions & 0 deletions README.md
Expand Up @@ -94,6 +94,11 @@ Default: `process.env.SAUCE_ACCESS_KEY`

Your Sauce Labs access key which you will see on your [account page](https://saucelabs.com/account).

### proxy
Type: `String`

Proxy for connecting to Sauce REST API, which is used to communicate job updates of pass/fail.

### startConnect
Type: `Boolean`
Default: `true`
Expand Down
6 changes: 5 additions & 1 deletion lib/sauce_launcher.js
Expand Up @@ -10,6 +10,7 @@ function processConfig (helper, config, args) {

var username = args.username || config.username || process.env.SAUCE_USERNAME
var accessKey = args.accessKey || config.accessKey || process.env.SAUCE_ACCESS_KEY
var proxy = args.proxy || config.proxy
var startConnect = config.startConnect !== false
var tunnelIdentifier = args.tunnelIdentifier || config.tunnelIdentifier

Expand Down Expand Up @@ -76,6 +77,7 @@ function processConfig (helper, config, args) {
browserName: browserName,
username: username,
accessKey: accessKey,
proxy: proxy,
startConnect: startConnect
}
}
Expand All @@ -99,6 +101,7 @@ var SauceLauncher = function (
var browserName = pConfig.browserName
var username = pConfig.username
var accessKey = pConfig.accessKey
var proxy = pConfig.proxy
var startConnect = pConfig.startConnect

var pendingCancellations = 0
Expand Down Expand Up @@ -155,7 +158,8 @@ var SauceLauncher = function (
credentials: {
username: username,
password: accessKey
}
},
proxy: proxy
}

sessionIsReady = true
Expand Down
7 changes: 6 additions & 1 deletion lib/sauce_reporter.js
Expand Up @@ -27,7 +27,12 @@ var SauceReporter = function (logger, /* sauce:jobMapping */ jobMapping) {
if (browserId in jobMapping) {
var jobDetails = jobMapping[browserId]

var sauceApi = new SauceLabs(jobDetails.credentials)
var sauceApiOptions = jobDetails.credentials
if (jobDetails.proxy) {
sauceApiOptions.proxy = jobDetails.proxy
}

var sauceApi = new SauceLabs(sauceApiOptions)

// We record pass/fail status, as well as the full results in "custom-data".
var payload = {
Expand Down

0 comments on commit bae758a

Please sign in to comment.