Merge pull request #5964 from Ocelot-Social-Community/backend-update-jest

refactor(backend): update jest

backend/package.json

@@ -116,7 +116,7 @@
     "eslint-plugin-prettier": "~3.4.1",
     "eslint-plugin-promise": "~4.3.1",
     "eslint-plugin-standard": "~4.0.1",
-    "jest": "~25.3.0",
+    "jest": "29.4",
     "nodemon": "~2.0.2",
     "prettier": "~2.3.2",
     "rosie": "^2.0.1",

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

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

backend/src/middleware/hashtags/hashtagsMiddleware.spec.js

@@ -50,6 +50,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

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', () => {

backend/src/middleware/languages/languages.spec.js

@@ -28,6 +28,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 const createPostMutation = gql`

backend/src/middleware/notifications/notificationsMiddleware.spec.js

@@ -56,6 +56,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

backend/src/middleware/orderByMiddleware.spec.js

@@ -24,6 +24,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

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

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}

backend/src/middleware/softDelete/softDeleteMiddleware.spec.js

@@ -195,6 +195,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 describe('softDeleteMiddleware', () => {

backend/src/middleware/userInteractions.spec.js

@@ -42,6 +42,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 describe('middleware/userInteractions', () => {

backend/src/middleware/validation/validationMiddleware.spec.js

@@ -75,6 +75,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

backend/src/models/User.spec.js

@@ -1,6 +1,7 @@
 import { cleanDatabase } from '../db/factories'
-import { getNeode } from '../db/neo4j'
+import { getNeode, getDriver } from '../db/neo4j'
 
+const driver = getDriver()
 const neode = getNeode()
 
 beforeAll(async () => {
@@ -9,6 +10,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
@@ -37,11 +39,10 @@ describe('slug', () => {
     )
   })
 
-  it('must be unique', async (done) => {
+  it('must be unique', async () => {
     await neode.create('User', { slug: 'Matt' })
     try {
       await expect(neode.create('User', { slug: 'Matt' })).rejects.toThrow('already exists')
-      done()
     } catch (error) {
       throw new Error(`
         ${error}

backend/src/schema/resolvers/comments.spec.js

@@ -25,6 +25,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

backend/src/schema/resolvers/donations.spec.js

@@ -37,6 +37,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 describe('donations', () => {

backend/src/schema/resolvers/emails.spec.js

@@ -30,6 +30,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

backend/src/schema/resolvers/follow.spec.js

@@ -71,6 +71,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

backend/src/schema/resolvers/groups.spec.js

@@ -252,6 +252,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 describe('in mode', () => {

backend/src/schema/resolvers/images/images.spec.js

@@ -15,6 +15,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {
@@ -78,7 +79,7 @@ describe('deleteImage', () => {
         await expect(someString).toEqual('Hello')
       })
 
-      it('rolls back the transaction in case of errors', async (done) => {
+      it('rolls back the transaction in case of errors', async () => {
         await expect(neode.all('Image')).resolves.toHaveLength(1)
         const session = driver.session()
         try {
@@ -93,7 +94,6 @@ describe('deleteImage', () => {
           // nothing has been deleted
           await expect(neode.all('Image')).resolves.toHaveLength(1)
           // all good
-          done()
         } finally {
           session.close()
         }
@@ -239,7 +239,7 @@ describe('mergeImage', () => {
           })
         })
 
-        it('rolls back the transaction in case of errors', async (done) => {
+        it('rolls back the transaction in case of errors', async () => {
           const session = driver.session()
           try {
             await session.writeTransaction(async (transaction) => {
@@ -254,7 +254,6 @@ describe('mergeImage', () => {
             // nothing has been created
             await expect(neode.all('Image')).resolves.toHaveLength(0)
             // all good
-            done()
           } finally {
             session.close()
           }

backend/src/schema/resolvers/inviteCodes.spec.js

@@ -52,6 +52,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 describe('inviteCodes', () => {

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

backend/src/schema/resolvers/moderation.spec.js

@@ -70,6 +70,7 @@ describe('moderate resources', () => {
 
   afterAll(async () => {
     await cleanDatabase()
+    driver.close()
   })
 
   beforeEach(async () => {

backend/src/schema/resolvers/notifications.spec.js

@@ -29,6 +29,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

backend/src/schema/resolvers/passwordReset.spec.js

@@ -38,6 +38,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(() => {

backend/src/schema/resolvers/posts.spec.js

@@ -56,6 +56,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

backend/src/schema/resolvers/postsInGroups.spec.js

@@ -61,6 +61,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 describe('Posts in Groups', () => {

backend/src/schema/resolvers/registration.spec.js

@@ -29,6 +29,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(async () => {

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

backend/src/schema/resolvers/rewards.spec.js

@@ -33,6 +33,7 @@ describe('rewards', () => {
 
   afterAll(async () => {
     await cleanDatabase()
+    driver.close()
   })
 
   beforeEach(async () => {

backend/src/schema/resolvers/searches.spec.js

@@ -26,6 +26,8 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
+  neode.close()
 })
 
 const searchQuery = gql`

backend/src/schema/resolvers/shout.spec.js

@@ -51,6 +51,7 @@ describe('shout and unshout posts', () => {
 
   afterAll(async () => {
     await cleanDatabase()
+    driver.close()
   })
 
   beforeEach(async () => {

backend/src/schema/resolvers/socialMedia.spec.js

@@ -12,6 +12,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 describe('SocialMedia', () => {

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

backend/src/schema/resolvers/userData.spec.js

@@ -60,6 +60,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 describe('resolvers/userData', () => {

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(() => {
@@ -137,7 +140,12 @@ describe('currentUser', () => {
 
   describe('authenticated', () => {
     describe('and corresponding user in the database', () => {
+      let avatar
+
       beforeEach(async () => {
+        avatar = await Factory.build('image', {
+          url: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
+        })
         await Factory.build(
           'user',
           {
@@ -149,9 +157,7 @@ describe('currentUser', () => {
           },
           {
             email: 'test@example.org',
-            avatar: Factory.build('image', {
+            avatar,
-              url: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
-            }),
           },
         )
         const userBearerToken = encode({ id: 'u3' })
@@ -163,9 +169,11 @@ describe('currentUser', () => {
           data: {
             currentUser: {
               id: 'u3',
-              avatar: Factory.build('image', {
+              avatar: {
-                url: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
+                url: expect.stringContaining(
-              }),
+                  'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
+                ),
+              },
               email: 'test@example.org',
               name: 'Matilde Hermiston',
               slug: 'matilde-hermiston',
@@ -243,7 +251,7 @@ describe('login', () => {
 
   describe('ask for a `token`', () => {
     describe('with a valid email/password combination', () => {
-      it('responds with a JWT bearer token', async (done) => {
+      it('responds with a JWT bearer token', async () => {
         const {
           data: { login: token },
         } = await mutate({ mutation: loginMutation, variables })
@@ -252,7 +260,6 @@ describe('login', () => {
             id: 'acb2d923-f3af-479e-9f00-61b12e864666',
           })
           expect(err).toBeNull()
-          done()
         })
       })
 

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

backend/src/schema/resolvers/users/location.spec.js

@@ -90,6 +90,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(() => {

backend/src/schema/resolvers/users/mutedUsers.spec.js

@@ -18,6 +18,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 beforeEach(() => {

backend/src/schema/resolvers/viewedTeaserCount.spec.js

@@ -28,6 +28,7 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase()
+  driver.close()
 })
 
 describe('count post teaser views', () => {