fix(tests): make trash test not fail when other test suites' items are still in trash; undo some thing I thought would fix it

Author: JupiterPi

package.json

@@ -8,7 +8,7 @@
     "start": "bun run src/index.ts",
     "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\" --ext .js,.jsx,.ts,.tsx",
     "lint-ci": "eslint \"src/**/*.{js,jsx,ts,tsx}\" --ext .js,.jsx,.ts,.tsx --format=@microsoft/eslint-formatter-sarif --output-file=eslint-report.sarif",
-    "test": "bun test --preload ./src/test/setup.ts --timeout 60_000",
+    "test": "bun test --preload ./src/test/setup.ts --timeout 30_000",
     "compile": "bun build --compile --target=bun --minify --sourcemap src/index.ts --outfile filen-cli --define IS_RUNNING_AS_BINARY=true",
     "bump-filen-dependencies": "bun i @filen/sdk@latest @filen/sync@latest @filen/webdav@latest @filen/s3@latest @filen/network-drive@latest"
   },

src/app/featureInterfaces/fs.test.ts

@@ -177,8 +177,8 @@ describe("fs commands", async () => {
 })
 
 /**
- * Waits for 15s to allow async operations to complete.
+ * Waits for 10s to allow async operations to complete.
  */
 export async function waitForAsyncEndpoint() {
-    return new Promise(resolve => setTimeout(resolve, 15_000))
+    return new Promise(resolve => setTimeout(resolve, 10_000))
 }

src/app/featureInterfaces/trashInterface.test.ts

@@ -16,17 +16,16 @@ describe("trash", async () => {
 
     beforeAll(async () => {
         await filen.cloud().emptyTrash()
-        root = (await prepareCloudFs([ "file1.txt", "file2.txt" ])).root
-        await filen.fs().rm({ path: root.navigate("file1.txt").toString(), permanent: false })
-        await filen.fs().rm({ path: root.navigate("file2.txt").toString(), permanent: false })
+        root = (await prepareCloudFs([ "trashtest_file1.txt", "trashtest_file2.txt" ])).root
+        await filen.fs().rm({ path: root.navigate("trashtest_file1.txt").toString(), permanent: false })
+        await filen.fs().rm({ path: root.navigate("trashtest_file2.txt").toString(), permanent: false })
     })
 
     it("should list trash items", async () => {
-        await waitForAsyncEndpoint()
         await waitForAsyncEndpoint()
         const { output } = await runMockApp({ cmd: "trash list" })
-        expect(output()).toContain("file1.txt")
-        expect(output()).toContain("file2.txt")
+        expect(output()).toContain("trashtest_file1.txt")
+        expect(output()).toContain("trashtest_file2.txt")
     })
 
     it("should delete trash item", async () => {
@@ -43,7 +42,9 @@ describe("trash", async () => {
     it("should list empty trash", async () => {
         await waitForAsyncEndpoint()
         const { output } = await runMockApp({ cmd: "trash list" })
-        expect(output()).toContain("empty")
+        expect(output()).not.toContain("trashtest_file1.txt")
+        expect(output()).not.toContain("trashtest_file2.txt")
+        // there might be other test suites running concurrently, so we can't check that it's completely empty
     })
 
 })

src/test/tests.ts

@@ -192,13 +192,13 @@ export class ResourceLock {
  * We cannot simply use the credentials every time (or even every run) because of rate limiting.
  */
 async function readFromDotenvFile(key: string) {
-    const dotenvFile = Bun.file(".env");
+    const dotenvFile = Bun.file(".env")
     if (!(await dotenvFile.exists())) return undefined
 
     const content = await dotenvFile.text()
     let value = ""
     for (let i = 0;; i++) {
-        const chunk = content.match(new RegExp(`^${key}_${i}="([^"]+)"`))
+        const chunk = content.match(new RegExp(`^${key}_${i}="([^"]+)"`, "gm"))
         if (!chunk) break
         value += chunk[1]
     }
@@ -208,7 +208,7 @@ async function writeAuthConfigToDotenvFile(key: string, str: string) {
     const dotenvFile = Bun.file(".env");
     if (!(await dotenvFile.exists())) return
 
-    const CHUNK_LENGTH = 4096
+    const CHUNK_LENGTH = 4096 - 100
     const chunks: string[] = []
     let i = 0
     while (i < str.length) {