From 2dbf8d1b2a9ce9db4e9b328ab7613a85485f0ab8 Mon Sep 17 00:00:00 2001 From: exoego Date: Fri, 29 May 2020 18:46:34 +0900 Subject: [PATCH 1/2] Fix wrong import and tests each import correctly --- .../src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala | 3 ++- .../src/main/scala/io/scalajs/nodejs/fs/WriteStream.scala | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala index ff0eda81f..50ae21cd6 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala @@ -10,7 +10,7 @@ class FsClassesTest extends AnyFunSpec { describe("ReadStream") { it("supports constructor(") { - assert(new ReadStream("package.json") !== null) + assert(new ReadStream("package.json").readableLength === 0) assert(new ReadStream(Buffer.from("package.json")) !== null) assert(new ReadStream(new URL(s"file:///${dirname}/package.json")) !== null) } @@ -18,6 +18,7 @@ class FsClassesTest extends AnyFunSpec { describe("WriteStream") { it("supports constructor") { + new WriteStream("package.json").cork() assert(new WriteStream("package.json") !== null) assert(new WriteStream(Buffer.from("package.json")) !== null) assert(new WriteStream(new URL(s"file:///${dirname}/package.json")) !== null) diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/WriteStream.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/WriteStream.scala index 5f640af6d..1332832f1 100644 --- a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/WriteStream.scala +++ b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/WriteStream.scala @@ -12,7 +12,7 @@ import scala.scalajs.js.| * @see https://nodejs.org/api/fs.html#fs_class_fs_writestream */ @js.native -@JSImport("fs", "ReadStream") +@JSImport("fs", "WriteStream") class WriteStream(path: Path) extends stream.Writable { ///////////////////////////////////////////////////////////////////////////////// // Properties From 315455c30cfde0b50c954120b982a856a7796a56 Mon Sep 17 00:00:00 2001 From: exoego Date: Fri, 29 May 2020 20:10:50 +0900 Subject: [PATCH 2/2] Do not open package.json to avoid erase it --- .../test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala index 50ae21cd6..4e94f0be1 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala @@ -18,10 +18,9 @@ class FsClassesTest extends AnyFunSpec { describe("WriteStream") { it("supports constructor") { - new WriteStream("package.json").cork() - assert(new WriteStream("package.json") !== null) - assert(new WriteStream(Buffer.from("package.json")) !== null) - assert(new WriteStream(new URL(s"file:///${dirname}/package.json")) !== null) + assert(new WriteStream("NO_SUCH_FILE").writableLength === 0) + assert(new WriteStream(Buffer.from("NO_SUCH_FILE")) !== null) + assert(new WriteStream(new URL(s"file:///${dirname}/NO_SUCH_FILE")) !== null) } } }