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

Commit

Permalink
fix(cli): allow running from command line without a config file
Browse files Browse the repository at this point in the history
If all necessary fields are specified (e.g. seleniumAddress and at least
one spec), a config file shouldn't be necessary.
  • Loading branch information
juliemr committed Sep 29, 2013
1 parent ec16138 commit c17ac12
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion lib/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,11 @@ while(args.length) {
}
}

merge(config, require(configPath).config);
if (configPath) {
merge(config, require(configPath).config);
} else {
configDir = "./";
}
merge(config, commandLineConfig);

var sauceAccount;
Expand Down

0 comments on commit c17ac12

Please sign in to comment.