Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,10 @@ function getBrowsersFromCLI() {
var outputList = [];
for (var i = 0; i < inputList.length; i++) {
var input = inputList[i];
if (sauceConf.customLaunchers.hasOwnProperty(input)) {
//Non-sauce browsers case: overrides everything, ignoring other options
var karmaChromeLauncher = require('karma-chrome-launcher');
if (sauceConf.customLaunchers.hasOwnProperty(input) || karmaChromeLauncher.hasOwnProperty("launcher:" + input)) {
// In case of non-sauce browsers, or browsers defined in karma-chrome-launcher (Chrome, ChromeCanary and Dartium):
// overrides everything, ignoring other options
outputList = [input];
isSauce = false;
break;
Expand Down