chore: leave out irrelevant config

CommunitySolidServer · Jan 18, 2022 · 862a6f8 · 862a6f8
1 parent 0d421b3
commit 862a6f8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/config/storage/backend/quota/quota-file.json b/config/storage/backend/quota/quota-file.json
@@ -16,7 +16,7 @@
       "@id": "urn:solid-server:default:SizeReporter",
       "@type": "FileSizeReporter",
       "fileIdentifierMapper": { "@id": "urn:solid-server:default:FileIdentifierMapper" },
-      "rootFilePath": { "@id": "urn:solid-server:default:variable:rootFilePath" },
+      "rootFilePath": { "@id": "urn:solid-server:default:variable:rootFilePath" }
     },
 
     {

diff --git a/src/storage/size-reporter/FileSizeReporter.ts b/src/storage/size-reporter/FileSizeReporter.ts
@@ -16,9 +16,9 @@ export class FileSizeReporter implements SizeReporter<string> {
   private readonly ignoreFolders: RegExp[];
   private readonly rootFilePath: string;
 
-  public constructor(fileIdentifierMapper: FileIdentifierMapper, rootFilePath: string, ignoreFolders: string[]) {
+  public constructor(fileIdentifierMapper: FileIdentifierMapper, rootFilePath: string, ignoreFolders?: string[]) {
     this.fileIdentifierMapper = fileIdentifierMapper;
-    this.ignoreFolders = ignoreFolders.map((folder: string): RegExp => new RegExp(folder, 'u'));
+    this.ignoreFolders = ignoreFolders ? ignoreFolders.map((folder: string): RegExp => new RegExp(folder, 'u')) : [];
     this.rootFilePath = normalizeFilePath(rootFilePath);
   }
 

diff --git a/test/integration/config/quota-pod.json b/test/integration/config/quota-pod.json
@@ -47,10 +47,6 @@
       },
       "PodQuotaStrategy:_limit_unit": "bytes"
     },
-    {
-      "@id": "urn:solid-server:default:SizeReporter",
-      "FileSizeReporter:_ignoreFolders": [ "^/\\.internal$" ]
-    },
     {
       "@id": "urn:solid-server:test:Instances",
       "@type": "RecordObject",

diff --git a/test/unit/storage/size-reporter/FileSizeReporter.test.ts b/test/unit/storage/size-reporter/FileSizeReporter.test.ts
@@ -31,6 +31,22 @@ describe('A FileSizeReporter', (): void => {
     await fsPromises.rmdir(fileRoot, { recursive: true });
   });
 
+  it('should work without the ignoreFolders constructor parameter.', async(): Promise<void> => {
+    const tempFileSizeReporter = new FileSizeReporter(
+      mapper,
+      fileRoot,
+    );
+
+    const testFile = join(fileRoot, './test.txt');
+    await fsPromises.writeFile(testFile, 'Test file for file size!');
+
+    const result = tempFileSizeReporter.getSize({ path: testFile });
+    await expect(result).resolves.toBeDefined();
+    expect((await result).amount).toBe((await fsPromises.stat(testFile)).size);
+
+    await fsPromises.unlink(testFile);
+  });
+
   it('should report the right file size.', async(): Promise<void> => {
     const testFile = join(fileRoot, './test.txt');
     await fsPromises.writeFile(testFile, 'Test file for file size!');