From 0ccc2dc08e1b1a573652b3bca7f2f4c2dfbb1f75 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sun, 14 Jan 2024 13:42:22 +0100
Subject: [PATCH] fix(tests): Clean up file system after each test

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
---
 src/lib/adapters/Git.ts |  8 +++++++-
 src/test/test.js        | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/lib/adapters/Git.ts b/src/lib/adapters/Git.ts
index 0e3167f72f..6816a9058e 100644
--- a/src/lib/adapters/Git.ts
+++ b/src/lib/adapters/Git.ts
@@ -19,7 +19,7 @@ import Crypto from '../Crypto'
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-const fs: FS = new FS('floccus', {wipe: true})
+let fs: FS = new FS('floccus', {wipe: true})
 
 const LOCK_INTERVAL = 2 * 60 * 1000 // Lock every 2mins while syncing
 const LOCK_TIMEOUT = 15 * 60 * 1000 // Override lock 0.25h after last time lock has been set
@@ -30,6 +30,12 @@ export default class GitAdapter extends CachingAdapter {
   private initialTreeHash: string
   private dir: string
 
+  static resetFilesystem(): void {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    fs = new FS('floccus', {wipe: true})
+  }
+
   constructor(server) {
     super(server)
     this.server = server
diff --git a/src/test/test.js b/src/test/test.js
index 07885c042f..2f715b7ccc 100644
--- a/src/test/test.js
+++ b/src/test/test.js
@@ -10,6 +10,7 @@ import * as AsyncParallel from 'async-parallel'
 import DefunctCrypto from '../lib/DefunctCrypto'
 import Controller from '../lib/Controller'
 import FakeAdapter from '../lib/adapters/Fake'
+import GitAdapter from '../lib/adapters/Git'
 
 chai.use(chaiAsPromised)
 const expect = chai.expect
@@ -277,6 +278,9 @@ describe('Floccus', function() {
                 await account.server.deleteFile(file.id)
               }
             }
+            if (ACCOUNT_DATA.type === 'git') {
+              GitAdapter.resetFilesystem()
+            }
             await account.delete()
           })
           it('should create local bookmarks on the server', async function() {
@@ -3181,6 +3185,9 @@ describe('Floccus', function() {
                 await account1.server.deleteFile(file.id)
               }
             }
+            if (ACCOUNT_DATA.type === 'git') {
+              GitAdapter.resetFilesystem()
+            }
             await account1.delete()
             await browser.bookmarks.removeTree(account2.getData().localRoot)
             await account2.delete()
@@ -4569,6 +4576,9 @@ describe('Floccus', function() {
                 await account.server.deleteFile(file.id)
               }
             }
+            if (ACCOUNT_DATA.type === 'git') {
+              GitAdapter.resetFilesystem()
+            }
             await account.delete()
           })
           it('should create local tabs on the server', async function() {
@@ -4889,6 +4899,9 @@ describe('Floccus', function() {
               await account1.server.deleteFile(file.id)
             }
           }
+          if (ACCOUNT_DATA.type === 'git') {
+            GitAdapter.resetFilesystem()
+          }
           await account1.delete()
           await browser.bookmarks.removeTree(account2.getData().localRoot)
           await account2.delete()