test: fix flaky test (#754)

google · Mar 29, 2024 · a950a05 · a950a05
1 parent 9d5b3e4
commit a950a05
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/examples/parallel.mjs b/examples/parallel.mjs
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { spinner } from 'zx/experimental'
+import { spinner } from 'zx'
 
 const tests = await glob('test/*.test.js')
 await spinner('running tests', async () => {

diff --git a/src/core.ts b/src/core.ts
@@ -556,7 +556,7 @@ function syncCwd() {
 
 export function cd(dir: string | ProcessOutput) {
   if (dir instanceof ProcessOutput) {
-    dir = dir.toString().replace(/\n+$/, '')
+    dir = dir.toString().trim()
   }
 
   $.log({ kind: 'cd', dir })

diff --git a/test/core.test.js b/test/core.test.js
@@ -13,8 +13,9 @@
 // limitations under the License.
 
 import assert from 'node:assert'
-import { test, describe, beforeEach } from 'node:test'
+import { test, describe } from 'node:test'
 import { inspect } from 'node:util'
+import { basename } from 'node:path'
 import { Readable, Writable } from 'node:stream'
 import { Socket } from 'node:net'
 import { ProcessPromise, ProcessOutput } from '../build/index.js'
@@ -297,10 +298,13 @@ describe('core', () => {
   })
 
   test('cd() accepts ProcessOutput in addition to string', async () => {
-    within(async () => {
+    await within(async () => {
       const tmpDir = await $`mktemp -d`
       cd(tmpDir)
-      assert.equal(process.cwd(), tmpDir.toString().trimEnd())
+      assert.equal(
+        basename(process.cwd()),
+        basename(tmpDir.toString().trimEnd())
+      )
     })
   })