Skip to content

Commit

Permalink
fix: override env vars with explicit config vars
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisWren committed Jul 23, 2014
1 parent 29e2f77 commit 4818172
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/sauce_launcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ var SauceLauncher = function(args, sauceConnect, /* config.sauceLabs */ config,

config = config || {};

var username = process.env.SAUCE_USERNAME || args.username || config.username;
var accessKey = process.env.SAUCE_ACCESS_KEY || args.accessKey || config.accessKey;
var username = args.username || config.username || process.env.SAUCE_USERNAME;
var accessKey = args.accessKey || config.accessKey || process.env.SAUCE_ACCESS_KEY;
var tunnelIdentifier = args.tunnelIdentifier || config.tunnelIdentifier;
var browserName = args.browserName + (args.version ? ' ' + args.version : '') +
(args.platform ? ' (' + args.platform + ')' : '');
Expand Down

2 comments on commit 4818172

@pkozlowski-opensource
Copy link
Member

Choose a reason for hiding this comment

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

Lgtm, although there is a slight chance of this change breaking people's setup

@ChrisWren
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@pkozlowski-opensource agreed, this is a minor version update

Please sign in to comment.