Skip to content

Commit

Permalink
fix(sauce): sauceAgent passed incorrectly to sauce node module
Browse files Browse the repository at this point in the history
  • Loading branch information
cnishina committed Jul 26, 2016
1 parent 828e80c commit c4ee56b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
18 changes: 16 additions & 2 deletions lib/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,23 @@ export interface Config {
sauceKey?: string;
/**
* Use sauceAgent if you need customize agent for https connection to
* saucelabs.com (i.e. your computer behind corporate proxy)
* saucelabs.com (i.e. your computer behind corporate proxy).
*
* To match sauce agent implementation, use
* [HttpProxyAgent](https://github.com/TooTallNate/node-http-proxy-agent)
* to generate the agent or use sauceProxy as an alternative where
* sauce generates the agent for you based on the proxy. If a sauceProxy is
* provided, the sauceAgent will be overridden.
*/
sauceAgent?: HttpProxyAgent;
/**
* Use sauceProxy that will get generated into an agent for https connection
* to saucelabs.com (i.e. your computer behind corporate proxy).
*
* The sauceProxy is used to generate a sauceAgent. If a sauceProxy is
* provided, the sauceAgent will be overridden.
*/
sauceAgent?: string;
sauceProxy?: string;
/**
* Use sauceBuild if you want to group test capabilites by a build ID
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/driverProviders/sauce.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ export class Sauce extends DriverProvider {
this.sauceServer_ = new SauceLabs({
username: this.config_.sauceUser,
password: this.config_.sauceKey,
agent: this.config_.sauceAgent
agent: this.config_.sauceAgent,
proxy: this.config_.sauceProxy
});
this.config_.capabilities['username'] = this.config_.sauceUser;
this.config_.capabilities['accessKey'] = this.config_.sauceKey;
Expand Down
4 changes: 4 additions & 0 deletions lib/globals.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,7 @@ declare namespace webdriver {
isPresent?: Function;
}
}

declare interface HttpProxyAgent {
constructor(opts: Object): HttpProxyAgent;
}

0 comments on commit c4ee56b

Please sign in to comment.