Merge 5596e0b into 5f5dabf

mojotech · Sep 16, 2015 · 11202ae · 11202ae
2 parents 5f5dabf + 5596e0b
commit 11202ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/config_builder.coffee b/src/config_builder.coffee
@@ -30,11 +30,10 @@ module.exports =
 
         switch
           when k is 'tags'
-            "--#{k}=".concat(
-              (_(Array::concat(val[k]))
+            _(Array::concat(val[k]))
+              .map((tagPart) -> ['--tags', tagPart])
               .flatten()
-              .value())
-              .join(", "))
+              .value()
 
           when k is 'driver'
             process.argv.push "--driver=#{val[k]}"

diff --git a/src/support/index.coffee b/src/support/index.coffee
@@ -93,11 +93,12 @@ module.exports = ->
       @driver.visit = @driver.get
 
   @After ->
-    terminateDriver() unless shouldPreventBrowserReload()
+    if @driver?
+      terminateDriver() unless shouldPreventBrowserReload()
 
   @registerHandler "AfterFeatures", (event, callback) =>
-    if shouldPreventBrowserReload()
-      terminateDriver().then -> callback()
+    if shouldPreventBrowserReload() and @driver?
+      terminateDriver().then callback
     else
       callback()
 

diff --git a/test/unit/config.coffee b/test/unit/config.coffee
@@ -86,7 +86,7 @@ describe "Pioneer configuration", ->
 
     it "should convertToExecOptions with multiple tags", ->
       configBuilder.convertToExecOptions(this.multiTagConfig, this.libPath)
-      .should.eql([null, null, "--require", "wow/support", "--tags=@wow, @doge"])
+      .should.eql([null, null, "--require", "wow/support", "--tags", "@wow", "--tags", "@doge"])
       process.argv.should.eql([])
 
     it "should push command line arguments for driver and reload", ->