close neo4j driver at the end of each test suite

2025-12-13 07:46:06 +00:00 · 2023-02-13 15:31:58 +01:00 · 2023-02-13 15:31:58 +01:00 · 7b3d530023
commit 7b3d530023
parent 4390d72477
37 changed files with 42 additions and 15 deletions
--- 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
--- 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
--- 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 () => {
--- 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', () => {
--- 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`
--- 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 () => {
--- 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 () => {
--- 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
--- 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}
--- 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', () => {
--- 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', () => {
--- 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 () => {
--- 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 () => {
--- 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', () => {
--- 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 () => {
--- 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 () => {
--- 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', () => {
--- 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 () => {
--- 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', () => {
--- 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
--- 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 () => {
--- 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 () => {
--- 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(() => {
--- 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 () => {
--- 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', () => {
--- 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 () => {
--- 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
--- 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`
--- 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 () => {
--- 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', () => {
--- 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
--- 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', () => {
--- 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(() => {
--- 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
--- 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(() => {
--- 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(() => {
--- 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', () => {