From 2c8c96149f0da5fffd56019b7b837d4cd853eaa6 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Wed, 13 Nov 2013 08:00:02 -0800 Subject: [PATCH] Fix how sauce runner and tags are parsed. --- .travis.yml | 2 +- test/saucelabs.js | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e371d4b1..8148fa783 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: global: - BIN="node" BUILD=false COMPAT=false MAKE=false OPTION="" SAUCE_LABS=false - SAUCE_USERNAME="lodash" - - secure: "LGVeh7z/x6hxGCtr1BfgCSRva691ChX+1bs4ecJE71QwsDNJwknqmblZm7hFSTkq7msSapSDV5P9sgr6fsmmHuY3311Vl04sneRpz8ge1ZUIbmMODI+tZAasxyvyjZJdOrTFZr89BWN6e/SddDxDKNF4n0O1DgUF4irrT+aUxUE=" + - secure: "aFxaPI4NvlZHgXvfmNtUlYCIeiVpC4QzkdevGHc2FK27BJLnNTKNno9sBhaygURbQ83bYzfQ+fe8SMIzE7aLramAGILrT4DiWqfO+ihuB3EK1cahCbB6OionbIUI27Xzy+YukO+5lQmMP/dpVlwhIfR3qxmN4m7wXI+ExEemjZg=" matrix: - BUILD="compat" - BUILD="modern" diff --git a/test/saucelabs.js b/test/saucelabs.js index 729bb1930..b9d34834a 100644 --- a/test/saucelabs.js +++ b/test/saucelabs.js @@ -28,7 +28,10 @@ tunnelId = 'lodash_' + process.env.TRAVIS_JOB_NUMBER; var runner = process.argv.reduce(function(result, value) { - return optionToValue('runner', value) || result; + value = optionToValue('runner', value); + return value == null + ? result + : '/' + value.replace(/^\W+/, ''); }, '/test/index.html'); var sessionName = process.argv.reduce(function(result, value) { @@ -36,7 +39,10 @@ }, 'lodash tests'); var tags = process.argv.reduce(function(result, value) { - return optionToArray('tags', value) || result; + value = optionToArray('tags', value); + return value.length + ? _.union(result, value) + : result; }, []); /** List of platforms to load the runner on */