Skip to content

Commit

Permalink
fix(sauce): bring back sauceProxy as a configuration option
Browse files Browse the repository at this point in the history
Reverts the change to PR angular#3868. Protractor should connect to Sauce Labs
via the sauceProxy. This is different than the webDriverProxy. The
webDriverProxy is tied to the browser session where we define where the
traffic will go through.

closes angular#4405
  • Loading branch information
cnishina committed Aug 3, 2017
1 parent b87159b commit 8236adb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions lib/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,14 @@ export interface Config {
*/
seleniumSessionId?: string;
/**
* The address of a proxy server to use for the connection to the
* Selenium Server. If not specified no proxy is configured. Looks like
* webDriverProxy: 'http://localhost:3128'
* The address of a proxy server to use for communicating to Sauce Labs rest APIs via the saucelabs
* node module. For example, the Sauce Labs Proxy can be setup with:
* sauceProxy: 'http://localhost:3128'
*/
sauceProxy?: string;

/**
* The proxy address that browser traffic will go through which is tied to the browser session.
*/
webDriverProxy?: string;

Expand Down
2 changes: 1 addition & 1 deletion lib/driverProviders/sauce.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export class Sauce extends DriverProvider {
username: this.config_.sauceUser,
password: this.config_.sauceKey,
agent: this.config_.sauceAgent,
proxy: this.config_.webDriverProxy
proxy: this.config_.sauceProxy
});
this.config_.capabilities['username'] = this.config_.sauceUser;
this.config_.capabilities['accessKey'] = this.config_.sauceKey;
Expand Down

0 comments on commit 8236adb

Please sign in to comment.