Merge pull request #106 from Tapad/feature/supportOutputFormattingArgs

Support being able to provide a '-o' argument with configuration parameters to the 'testExecutionArgs' plugin setting

Author: kurtkopchik

src/main/scala/com/tapad/docker/ComposeTestRunner.scala

@@ -18,7 +18,12 @@ trait ComposeTestRunner extends SettingsHelper with PrintFormatting {
   def binPackageTests(implicit state: State): Unit = {
     val extracted = Project.extract(state)
     state.globalLogging.full.info(s"Compiling and Packaging test cases using ${testCasesPackageTask.key.label} ...")
-    extracted.runTask(testCasesPackageTask, state)
+    try {
+      extracted.runTask(testCasesPackageTask, state)
+    } catch {
+      case e: Exception =>
+        throw TestCodeCompilationException(e.getMessage)
+    }
   }
 
   /**

src/main/scala/com/tapad/docker/DockerComposePlugin.scala

@@ -17,6 +17,13 @@ import scala.util.Try
  */
 case class ComposeFileFormatException(message: String) extends Exception(message)
 
+/**
+ * The exception type to be thrown when there is an issue compiling the test case code
+ *
+ * @param message The error message to be displayed on the console
+ */
+case class TestCodeCompilationException(message: String) extends Exception(message)
+
 /**
  * Defines an internal to external port mapping for a Docker Compose service port
  *
@@ -421,13 +428,17 @@ class DockerComposePluginLocal extends AutoPlugin with ComposeFile with DockerCo
     val requiresShutdown = getMatchingRunningInstance(newState, args).isEmpty
     val (preTestState, instance) = getTestPassInstance(newState, args)
 
-    val finalState = if (getSetting(testPassUseCucumber))
-      runTestPassCucumber(preTestState, args, instance)
-    else if (getSetting(testPassUseSpecs2)) {
-      runTestPassSpecs2(preTestState, args, instance)
-    } else {
-      runTestPass(preTestState, args, instance)
-    }
+    //Ensure that if an exception is thrown when building the test code or during the test pass that
+    //the instance that was started is cleaned up
+    val finalState = Try {
+      if (getSetting(testPassUseCucumber))
+        runTestPassCucumber(preTestState, args, instance)
+      else if (getSetting(testPassUseSpecs2)) {
+        runTestPassSpecs2(preTestState, args, instance)
+      } else {
+        runTestPass(preTestState, args, instance)
+      }
+    }.getOrElse(preTestState)
 
     if (requiresShutdown)
       stopDockerCompose(finalState, Seq(instance.get.instanceName))

src/main/scala/com/tapad/docker/ExecuteInput.scala

@@ -50,19 +50,24 @@ object ExecuteInput {
   val ScalaTest: PartialFunction[ExecuteInput, TestRunnerCommand] = {
     case input: ExecuteInput if input.matches(".*org.scalatest.*") =>
 
+      val outputArg = "-o"
       val testTags = (input.runner.getArgValue(input.runner.testTagOverride, input.args) match {
         case Some(tag) => tag
         case None => input.runner.getSetting(testTagsToExecute)(input.state)
       }).split(',').filter(_.nonEmpty).map(tag => s"-n $tag").mkString(" ")
 
       val noColorOption = if (input.suppressColor) "W" else ""
 
+      //If testArgs contains '-o' values then parse them out to combine with the existing '-o' setting
+      val (testArgsOutput, testArgs) = input.testArgs.partition(_.startsWith(outputArg))
+      val outputFormattingArgs = testArgsOutput.map(_.replace(outputArg, "")).headOption.getOrElse("")
+
       val jarName = input.runner.getSetting(testCasesJar)(input.state)
 
       val testRunnerCommand: Seq[String] = (Seq("java", input.debugSettings) ++
         input.testParamsList ++
-        Seq("-cp", input.testDependencyClasspath, "org.scalatest.tools.Runner", s"-o$noColorOption") ++
-        input.testArgs ++
+        Seq("-cp", input.testDependencyClasspath, "org.scalatest.tools.Runner", s"$outputArg$noColorOption$outputFormattingArgs") ++
+        testArgs ++
         Seq("-R", s"${jarName.replace(" ", "\\ ")}") ++
         testTags.split(" ").toSeq ++
         input.testParamsList).filter(_.nonEmpty)