Factor helper in integration tests

Author: alexarchambault

modules/integration/src/test/scala/scala/cli/integration/ConfigTests.scala

@@ -2,9 +2,6 @@ package scala.cli.integration
 
 import com.eed3si9n.expecty.Expecty.expect
 
-import java.io.File
-import java.util.Locale
-
 import scala.util.Properties
 
 class ConfigTests extends ScalaCliSuite {
@@ -104,30 +101,9 @@ class ConfigTests extends ScalaCliSuite {
       if (!Properties.isWin)
         os.perms.set(confDir, "rwx------")
 
-      val extraEnv = {
-        val (pathVarName, currentPath) = sys.env
-          .find(_._1.toLowerCase(Locale.ROOT) == "path")
-          .getOrElse(("PATH", ""))
-        val binDir = root / "bin"
-        if (Properties.isWin) {
-          val script =
-            s"""@echo off
-               |"${TestUtil.cs}" %*
-               |""".stripMargin
-          os.write(binDir / "cs.bat", script, createFolders = true)
-        }
-        else {
-          val script =
-            s"""#!/usr/bin/env bash
-               |exec "${TestUtil.cs}" "$$@"
-               |""".stripMargin
-          os.write(binDir / "cs", script, "rwxr-xr-x", createFolders = true)
-        }
-        Map(
-          "SCALA_CLI_CONFIG" -> confFile.toString,
-          pathVarName        -> s"$binDir${File.pathSeparator}$currentPath"
-        )
-      }
+      val extraEnv =
+        Map("SCALA_CLI_CONFIG" -> confFile.toString) ++
+          TestUtil.putCsInPathViaEnv(root / "bin")
 
       val res = os.proc(TestUtil.cli, "config", "httpProxy.address")
         .call(cwd = root, env = extraEnv)

modules/integration/src/test/scala/scala/cli/integration/TestUtil.scala

@@ -4,6 +4,7 @@ import os.{CommandResult, Path}
 
 import java.io.File
 import java.net.ServerSocket
+import java.util.Locale
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.{ExecutorService, Executors, ScheduledExecutorService, ThreadFactory}
 
@@ -222,4 +223,26 @@ object TestUtil {
       }
     }
   }
+
+  def putCsInPathViaEnv(binDir: os.Path): Map[String, String] = {
+
+    val (pathVarName, currentPath) = sys.env
+      .find(_._1.toLowerCase(Locale.ROOT) == "path")
+      .getOrElse(("PATH", ""))
+    if (Properties.isWin) {
+      val script =
+        s"""@echo off
+           |"${TestUtil.cs}" %*
+           |""".stripMargin
+      os.write(binDir / "cs.bat", script, createFolders = true)
+    }
+    else {
+      val script =
+        s"""#!/usr/bin/env bash
+           |exec "${TestUtil.cs}" "$$@"
+           |""".stripMargin
+      os.write(binDir / "cs", script, "rwxr-xr-x", createFolders = true)
+    }
+    Map(pathVarName -> s"$binDir${File.pathSeparator}$currentPath")
+  }
 }