From b9208caad224dc6843d1bad64d4489660f160a81 Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Thu, 5 Oct 2023 15:29:43 +0200 Subject: [PATCH 1/3] chore: Remove contributors field It keeps changing and being out of date all the time anyway --- package.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package.json b/package.json index fbc1a93a6..9c711e79f 100644 --- a/package.json +++ b/package.json @@ -8,14 +8,6 @@ "rdf", "ldp" ], - "contributors": [ - "Joachim Van Herwegen ", - "Thomas Dupont ", - "Wannes Kerckhove ", - "Jasper Vaneessen ", - "Ruben Taelman (https://www.rubensworks.net/)", - "Ruben Verborgh (https://ruben.verborgh.org/)" - ], "license": "MIT", "engines": { "node": ">=14.14" From 3a57e88229bafce23b4165ef15ebdfb1a1826b55 Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Thu, 5 Oct 2023 16:35:43 +0200 Subject: [PATCH 2/3] test: Stop cleaning up folders after quota test to prevent CI issues --- test/integration/Quota.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/Quota.test.ts b/test/integration/Quota.test.ts index 6f575e9d5..518c493c5 100644 --- a/test/integration/Quota.test.ts +++ b/test/integration/Quota.test.ts @@ -93,7 +93,7 @@ describe('A quota server', (): void => { }); afterAll(async(): Promise => { - await removeFolder(rootFilePath); + // Not cleaning up `rootFilePath` as this intermittently causes issues during CI await app.stop(); }); @@ -178,7 +178,7 @@ describe('A quota server', (): void => { }); afterAll(async(): Promise => { - await removeFolder(rootFilePath); + // Not cleaning up `rootFilePath` as this intermittently causes issues during CI await app.stop(); }); From 9bf734817deaaf3e06b0eccac2423092bd1427c5 Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Thu, 5 Oct 2023 17:03:42 +0200 Subject: [PATCH 3/3] test: Remove test tmp folder after all tests are finished --- jest.config.js | 1 + test/util/TeardownTests.ts | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 test/util/TeardownTests.ts diff --git a/jest.config.js b/jest.config.js index 3c080fa6d..63c2e1b35 100644 --- a/jest.config.js +++ b/jest.config.js @@ -40,6 +40,7 @@ module.exports = { ], testEnvironment: 'node', globalSetup: '/test/util/SetupTests.ts', + globalTeardown: '/test/util/TeardownTests.ts', setupFilesAfterEnv: [ 'jest-rdf' ], collectCoverage: false, // See https://github.com/matthieubosquet/ts-dpop/issues/13 diff --git a/test/util/TeardownTests.ts b/test/util/TeardownTests.ts new file mode 100644 index 000000000..69d376b79 --- /dev/null +++ b/test/util/TeardownTests.ts @@ -0,0 +1,7 @@ +import { getTestFolder, removeFolder } from '../integration/Config'; + +// Jest global teardown requires a single function to be exported +export default async function(): Promise { + // Clean up the root test folder + await removeFolder(getTestFolder('')); +}