Skip to content

Commit 30beea0

Browse files
authored
Merge pull request #3312 from armanbilge/fix/js-tmp-file
Fix temporary file name generation on Node.js
2 parents 10ebc53 + c54727b commit 30beea0

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

io/js/src/main/scala/fs2/io/file/FilesPlatform.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ private[fs2] trait FilesCompanionPlatform {
123123
permissions: Option[Permissions]
124124
): F[Path] =
125125
for {
126-
dir <- createTempDirectory(dir, prefix, permissions)
127-
path = dir / Option(suffix).filter(_.nonEmpty).getOrElse(".tmp")
126+
dir <- createTempDirectory(dir, "", permissions)
127+
path = dir / (prefix + suffix)
128128
_ <- open(path, Flags.Write).use_
129129
_ <- permissions
130130
.collect { case posix @ PosixPermissions(_) =>

io/shared/src/test/scala/fs2/io/file/FilesSuite.scala

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ class FilesSuite extends Fs2IoSuite with BaseFileSuite {
374374
.use { tempDir =>
375375
val files = Files[IO]
376376
files
377-
.tempFile(Some(tempDir), "", "", None)
377+
.tempFile(Some(tempDir), "tmp", "", None)
378378
.use { file =>
379379
// files.exists(tempDir / file.fileName)
380380
IO.pure(file.startsWith(tempDir))
@@ -396,6 +396,16 @@ class FilesSuite extends Fs2IoSuite with BaseFileSuite {
396396
}
397397
.assertEquals(true)
398398
}
399+
400+
test("filename should begin with prefix and end with suffix") {
401+
Files[IO].tempFile(None, "prefix", "suffix", None).use { path =>
402+
IO {
403+
val fn = path.fileName.toString
404+
assert(clue(fn).startsWith("prefix"))
405+
assert(clue(fn).endsWith("suffix"))
406+
}
407+
}
408+
}
399409
}
400410

401411
group("tempDirectoryStream") {

0 commit comments

Comments
 (0)