Fix tests

openmole · Jan 16, 2020 · 864091c · 864091c
1 parent 5e8445c
commit 864091c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/site/src/main/scala/scalatex/site/Site.scala b/site/src/main/scala/scalatex/site/Site.scala
@@ -1,9 +1,11 @@
 package scalatex.site
 
+import java.io.FileOutputStream
 import java.nio.CharBuffer
-import java.nio.file.{Files, StandardCopyOption}
+import java.nio.file.{Files, StandardCopyOption, StandardOpenOption}
 
 import ammonite.ops.{Path, _}
+import os.SubProcess.{InputStream, OutputStream}
 import scalatags.Text.all._
 import scalatags.Text.{attrs, tags2}
 
@@ -94,27 +96,29 @@ trait Site{
   def content: Map[String, Page]
 
   def bundleResources(outputRoot: Path) = {
+    for {
+      dest <- Seq(scriptName, stylesName)
+      path = outputRoot / dest
+    } new FileOutputStream(path.toIO, true).close()
+
     for {
       (ext, dest) <- Seq("js" -> scriptName, "css" -> stylesName)
+      path = outputRoot / dest
       res <- autoResources |? (_.ext == ext)
     } {
-      val is = res.getInputStream
-      val path = outputRoot / dest
-      try {
-        path.toIO.mkdirs()
-        Files.copy(is, path.wrapped, StandardCopyOption.REPLACE_EXISTING)
-      } finally is.close()
+      val content = read(res)
+
+      path.toIO.getParentFile.mkdirs()
+      Files.writeString(path.wrapped, content, StandardOpenOption.CREATE)
     }
 
     for {
       res <- manualResources
     } {
-      val is = res.getInputStream
+      val content = read(res)
       val path = outputRoot/(res relativeTo resource)
-      try {
-        path.toIO.mkdirs()
-        Files.copy(is, path.wrapped, StandardCopyOption.REPLACE_EXISTING)
-      } finally is.close()
+      path.toIO.getParentFile.mkdirs()
+      Files.writeString(path.wrapped, content, StandardOpenOption.CREATE)
     }
   }
 

diff --git a/site/src/test/scala/scalatex/site/Tests.scala b/site/src/test/scala/scalatex/site/Tests.scala
@@ -204,21 +204,21 @@ object Tests extends TestSuite{
     }
     'Site{
       'simple {
-        rm! wd/'site/'target/'output
+        rm! wd / "site" / "target"/ "output"
         val site = new scalatex.site.Site {
           def content = Map("index.html" -> (defaultHeader, Hello()))
         }
-        site.renderTo(wd/'site/'target/'output)
+        site.renderTo(wd/ "site" / "target" / "output")
 
         def check() = {
-          val readText = read! wd/'site/'target/'output/"index.html"
+          val readText = read! wd / "site" / "target" / "output" /"index.html"
           assert(
             readText.contains("Hello World"),
             readText.contains("I am a cow!"),
             readText.contains("<div>"),
             readText.contains("<h1>"),
-            exists(wd/'site/'target/'output/"scripts.js"),
-            exists(wd/'site/'target/'output/"styles.css")
+            exists(wd / "site" / "target" / "output" / "scripts.js"),
+            exists(wd/ "site" / "target" / "output" / "styles.css")
           )
         }
         check()