diff --git a/backend/src/activitypub/routes/webfinger.spec.js b/backend/src/activitypub/routes/webfinger.spec.js index 8b0e5ff55..33b4f552f 100644 --- a/backend/src/activitypub/routes/webfinger.spec.js +++ b/backend/src/activitypub/routes/webfinger.spec.js @@ -33,6 +33,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) // TODO: avoid database clean after each test in the future if possible for performance and flakyness reasons by filling the database step by step, see issue https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/4543 diff --git a/backend/src/jwt/decode.spec.js b/backend/src/jwt/decode.spec.js index bb247f028..84caba736 100644 --- a/backend/src/jwt/decode.spec.js +++ b/backend/src/jwt/decode.spec.js @@ -36,6 +36,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) // TODO: avoid database clean after each test in the future if possible for performance and flakyness reasons by filling the database step by step, see issue https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/4543 diff --git a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js index 19f60556f..bcecee73b 100644 --- a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js +++ b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js @@ -50,6 +50,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/middleware/helpers/email/templateBuilder.spec.js b/backend/src/middleware/helpers/email/templateBuilder.spec.js index 7b4310483..d5b0edf21 100644 --- a/backend/src/middleware/helpers/email/templateBuilder.spec.js +++ b/backend/src/middleware/helpers/email/templateBuilder.spec.js @@ -80,14 +80,6 @@ const testEmailData = (emailTemplate, templateBuilder, templateData, texts) => { return emailTemplate } -// beforeAll(async () => { -// await cleanDatabase() -// }) - -// afterAll(async () => { -// await cleanDatabase() -// }) - describe('templateBuilder', () => { describe('signupTemplate', () => { describe('multi language', () => { diff --git a/backend/src/middleware/languages/languages.spec.js b/backend/src/middleware/languages/languages.spec.js index b22de9148..99e87152e 100644 --- a/backend/src/middleware/languages/languages.spec.js +++ b/backend/src/middleware/languages/languages.spec.js @@ -28,6 +28,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) const createPostMutation = gql` diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js index 6c06ac072..ad7fd3f8c 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js @@ -56,6 +56,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/middleware/orderByMiddleware.spec.js b/backend/src/middleware/orderByMiddleware.spec.js index cc3cf7a94..1aef1c52a 100644 --- a/backend/src/middleware/orderByMiddleware.spec.js +++ b/backend/src/middleware/orderByMiddleware.spec.js @@ -24,6 +24,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js index 9d71314bb..35a2ab82b 100644 --- a/backend/src/middleware/permissionsMiddleware.spec.js +++ b/backend/src/middleware/permissionsMiddleware.spec.js @@ -28,6 +28,7 @@ describe('authorization', () => { afterAll(async () => { await cleanDatabase() + driver.close() }) // TODO: avoid database clean after each test in the future if possible for performance and flakyness reasons by filling the database step by step, see issue https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/4543 diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js index cfcd71ab7..b0b2371b2 100644 --- a/backend/src/middleware/slugifyMiddleware.spec.js +++ b/backend/src/middleware/slugifyMiddleware.spec.js @@ -33,6 +33,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { @@ -152,7 +153,7 @@ describe('slugifyMiddleware', () => { }) describe('but if the client specifies a slug', () => { - it('rejects CreateGroup', async (done) => { + it('rejects CreateGroup', async () => { try { await expect( mutate({ @@ -171,7 +172,6 @@ describe('slugifyMiddleware', () => { }, ], }) - done() } catch (error) { throw new Error(` ${error} @@ -258,7 +258,7 @@ describe('slugifyMiddleware', () => { }) describe('setting slug explicitly', () => { - it('rejects UpdateGroup', async (done) => { + it('rejects UpdateGroup', async () => { try { await expect( mutate({ @@ -275,7 +275,6 @@ describe('slugifyMiddleware', () => { }, ], }) - done() } catch (error) { throw new Error(` ${error} @@ -382,7 +381,7 @@ describe('slugifyMiddleware', () => { }) describe('but if the client specifies a slug', () => { - it('rejects CreatePost', async (done) => { + it('rejects CreatePost', async () => { try { await expect( mutate({ @@ -402,7 +401,6 @@ describe('slugifyMiddleware', () => { }, ], }) - done() } catch (error) { throw new Error(` ${error} diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js index a4d32c4a7..7e14cad1f 100644 --- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js +++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js @@ -195,6 +195,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) describe('softDeleteMiddleware', () => { diff --git a/backend/src/middleware/userInteractions.spec.js b/backend/src/middleware/userInteractions.spec.js index 3846e1e8e..2f97bda5a 100644 --- a/backend/src/middleware/userInteractions.spec.js +++ b/backend/src/middleware/userInteractions.spec.js @@ -42,6 +42,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) describe('middleware/userInteractions', () => { diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js index b6bcafa9b..a887832c1 100644 --- a/backend/src/middleware/validation/validationMiddleware.spec.js +++ b/backend/src/middleware/validation/validationMiddleware.spec.js @@ -75,6 +75,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js index 33b33ed3e..09487082e 100644 --- a/backend/src/schema/resolvers/comments.spec.js +++ b/backend/src/schema/resolvers/comments.spec.js @@ -25,6 +25,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/donations.spec.js b/backend/src/schema/resolvers/donations.spec.js index 11df0c67b..5a2bcfd7b 100644 --- a/backend/src/schema/resolvers/donations.spec.js +++ b/backend/src/schema/resolvers/donations.spec.js @@ -37,6 +37,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) describe('donations', () => { diff --git a/backend/src/schema/resolvers/emails.spec.js b/backend/src/schema/resolvers/emails.spec.js index 068e9263c..4778e3fcf 100644 --- a/backend/src/schema/resolvers/emails.spec.js +++ b/backend/src/schema/resolvers/emails.spec.js @@ -30,6 +30,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/follow.spec.js b/backend/src/schema/resolvers/follow.spec.js index e0b2a277a..14d8a366d 100644 --- a/backend/src/schema/resolvers/follow.spec.js +++ b/backend/src/schema/resolvers/follow.spec.js @@ -71,6 +71,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/groups.spec.js b/backend/src/schema/resolvers/groups.spec.js index e122eeb13..3b84f4b42 100644 --- a/backend/src/schema/resolvers/groups.spec.js +++ b/backend/src/schema/resolvers/groups.spec.js @@ -252,6 +252,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) describe('in mode', () => { diff --git a/backend/src/schema/resolvers/images/images.spec.js b/backend/src/schema/resolvers/images/images.spec.js index 5ede151a9..078e9dcef 100644 --- a/backend/src/schema/resolvers/images/images.spec.js +++ b/backend/src/schema/resolvers/images/images.spec.js @@ -15,6 +15,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/inviteCodes.spec.js b/backend/src/schema/resolvers/inviteCodes.spec.js index 72e2a2492..b55ab079b 100644 --- a/backend/src/schema/resolvers/inviteCodes.spec.js +++ b/backend/src/schema/resolvers/inviteCodes.spec.js @@ -52,6 +52,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) describe('inviteCodes', () => { diff --git a/backend/src/schema/resolvers/locations.spec.js b/backend/src/schema/resolvers/locations.spec.js index 3742c59c6..87542cf6d 100644 --- a/backend/src/schema/resolvers/locations.spec.js +++ b/backend/src/schema/resolvers/locations.spec.js @@ -26,6 +26,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) // TODO: avoid database clean after each test in the future if possible for performance and flakyness reasons by filling the database step by step, see issue https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/4543 diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js index 3c2926c14..9f5014756 100644 --- a/backend/src/schema/resolvers/moderation.spec.js +++ b/backend/src/schema/resolvers/moderation.spec.js @@ -70,6 +70,7 @@ describe('moderate resources', () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js index 924154488..82d6e6371 100644 --- a/backend/src/schema/resolvers/notifications.spec.js +++ b/backend/src/schema/resolvers/notifications.spec.js @@ -29,6 +29,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/passwordReset.spec.js b/backend/src/schema/resolvers/passwordReset.spec.js index bc2a48bc8..90c570f5a 100644 --- a/backend/src/schema/resolvers/passwordReset.spec.js +++ b/backend/src/schema/resolvers/passwordReset.spec.js @@ -38,6 +38,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(() => { diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js index 6fc9b5722..7a0dc0176 100644 --- a/backend/src/schema/resolvers/posts.spec.js +++ b/backend/src/schema/resolvers/posts.spec.js @@ -56,6 +56,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/postsInGroups.spec.js b/backend/src/schema/resolvers/postsInGroups.spec.js index c55076a23..5bf5820f0 100644 --- a/backend/src/schema/resolvers/postsInGroups.spec.js +++ b/backend/src/schema/resolvers/postsInGroups.spec.js @@ -61,6 +61,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) describe('Posts in Groups', () => { diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js index aacfb1054..ae6bcb7d7 100644 --- a/backend/src/schema/resolvers/registration.spec.js +++ b/backend/src/schema/resolvers/registration.spec.js @@ -29,6 +29,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js index 7cf4d9a34..449bdb3a7 100644 --- a/backend/src/schema/resolvers/reports.spec.js +++ b/backend/src/schema/resolvers/reports.spec.js @@ -117,6 +117,7 @@ describe('file a report on a resource', () => { afterAll(async () => { await cleanDatabase() + driver.close() }) // TODO: avoid database clean after each test in the future if possible for performance and flakyness reasons by filling the database step by step, see issue https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/4543 diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js index 4a8623df5..b425e930e 100644 --- a/backend/src/schema/resolvers/searches.spec.js +++ b/backend/src/schema/resolvers/searches.spec.js @@ -26,6 +26,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) const searchQuery = gql` diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js index 087c452da..f774d7d0b 100644 --- a/backend/src/schema/resolvers/shout.spec.js +++ b/backend/src/schema/resolvers/shout.spec.js @@ -51,6 +51,7 @@ describe('shout and unshout posts', () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(async () => { diff --git a/backend/src/schema/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js index fc9ee8f70..dafbed6d6 100644 --- a/backend/src/schema/resolvers/socialMedia.spec.js +++ b/backend/src/schema/resolvers/socialMedia.spec.js @@ -12,6 +12,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) describe('SocialMedia', () => { diff --git a/backend/src/schema/resolvers/statistics.spec.js b/backend/src/schema/resolvers/statistics.spec.js index b9fdd9196..46330ef9a 100644 --- a/backend/src/schema/resolvers/statistics.spec.js +++ b/backend/src/schema/resolvers/statistics.spec.js @@ -39,6 +39,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) // TODO: avoid database clean after each test in the future if possible for performance and flakyness reasons by filling the database step by step, see issue https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/4543 diff --git a/backend/src/schema/resolvers/userData.spec.js b/backend/src/schema/resolvers/userData.spec.js index 779f090e4..ee4901f0a 100644 --- a/backend/src/schema/resolvers/userData.spec.js +++ b/backend/src/schema/resolvers/userData.spec.js @@ -60,6 +60,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) describe('resolvers/userData', () => { diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js index 66896f485..668519371 100644 --- a/backend/src/schema/resolvers/user_management.spec.js +++ b/backend/src/schema/resolvers/user_management.spec.js @@ -6,10 +6,12 @@ import { loginMutation } from '../../graphql/userManagement' import { createTestClient } from 'apollo-server-testing' import createServer, { context } from '../../server' import encode from '../../jwt/encode' -import { getNeode } from '../../db/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import { categories } from '../../constants/categories' const neode = getNeode() +const driver = getDriver() + let query, mutate, variables, req, user const disable = async (id) => { @@ -47,6 +49,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(() => { diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js index 87226ec4d..9b7699dc1 100644 --- a/backend/src/schema/resolvers/users.spec.js +++ b/backend/src/schema/resolvers/users.spec.js @@ -81,6 +81,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) // TODO: avoid database clean after each test in the future if possible for performance and flakyness reasons by filling the database step by step, see issue https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/4543 diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index c0525ca1c..73938c41a 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -90,6 +90,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(() => { diff --git a/backend/src/schema/resolvers/users/mutedUsers.spec.js b/backend/src/schema/resolvers/users/mutedUsers.spec.js index d8efacfae..5c1a7dd5d 100644 --- a/backend/src/schema/resolvers/users/mutedUsers.spec.js +++ b/backend/src/schema/resolvers/users/mutedUsers.spec.js @@ -18,6 +18,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) beforeEach(() => { diff --git a/backend/src/schema/resolvers/viewedTeaserCount.spec.js b/backend/src/schema/resolvers/viewedTeaserCount.spec.js index 7f8e7f102..d7437646b 100644 --- a/backend/src/schema/resolvers/viewedTeaserCount.spec.js +++ b/backend/src/schema/resolvers/viewedTeaserCount.spec.js @@ -28,6 +28,7 @@ beforeAll(async () => { afterAll(async () => { await cleanDatabase() + driver.close() }) describe('count post teaser views', () => {