Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

fix(driverProviders): Check config in the right place. #3991

Merged
merged 2 commits into from
Jan 20, 2017

Conversation

heathkit
Copy link
Contributor

@heathkit heathkit commented Jan 20, 2017

Fixes CI, that's what I get for not being patient.

Copy link
Contributor

@sjelin sjelin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but I'd prefer you moved the check into the else block for the if for serverConf.jvmArgs

@@ -115,6 +111,9 @@ export class Local extends DriverProvider {
if (serverConf.port === undefined) {
serverConf.port = this.config_.seleniumPort;
}
if (!Array.isArray(serverConf.jvmArgs)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably be in an else block back on line 110

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call, done.

@heathkit heathkit merged commit e68dcf1 into angular:master Jan 20, 2017
@heathkit heathkit deleted the unhandled-rejection branch February 7, 2017 01:36
igniteram pushed a commit to igniteram/protractor that referenced this pull request Feb 21, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants