fix: broken tests due to change in user model

opengovsg · Apr 15, 2021 · 17632fb · 17632fb
1 parent adb4f9c
commit 17632fb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 39 deletions.
diff --git a/src/server/modules/statistics/repositories/__tests__/StatisticsRepository.test.ts b/src/server/modules/statistics/repositories/__tests__/StatisticsRepository.test.ts
@@ -63,15 +63,16 @@ describe('StatisticsRepository', () => {
   const userCount = 1
   const clickCount = 3
   const linkCount = 2
-  const scope = jest.spyOn(urlModelMock, 'scope')
+  const urlScope = jest.spyOn(urlModelMock, 'scope')
+  const userScope = jest.spyOn(userModelMock, 'scope')
 
   beforeEach(async () => {
     await new Promise<void>((resolve) => {
       redisMockClient.flushall(() => resolve())
     })
     setSpy.mockClear()
     mgetSpy.mockClear()
-    scope.mockReset()
+    urlScope.mockReset()
   })
 
   afterEach(async () => {
@@ -104,10 +105,8 @@ describe('StatisticsRepository', () => {
 
     // @ts-ignore
     mgetSpy.mockImplementation(raiseError)
-    Object.assign(userModelMock, {
-      unscoped: () => ({ count: () => userCount }),
-    })
-    scope.mockReturnValue({ count: () => linkCount })
+    userScope.mockReturnValue({ count: () => userCount })
+    urlScope.mockReturnValue({ count: () => linkCount })
     Object.assign(urlClicksModelMock, {
       unscoped: () => ({ sum: () => clickCount }),
     })
@@ -132,10 +131,8 @@ describe('StatisticsRepository', () => {
       callback(new Error('error'))
     }
 
-    Object.assign(userModelMock, {
-      unscoped: () => ({ count: () => userCount }),
-    })
-    scope.mockReturnValue({ count: () => linkCount })
+    userScope.mockReturnValue({ count: () => userCount })
+    urlScope.mockReturnValue({ count: () => linkCount })
     Object.assign(urlClicksModelMock, {
       sum: () => clickCount,
     })

diff --git a/test/server/repositories/UserRepository.test.ts b/test/server/repositories/UserRepository.test.ts
@@ -40,19 +40,15 @@ const expectedUrl = {
 
 describe('UserRepository', () => {
   describe('findById', () => {
-    const { scope } = userModelMock
-    const findByPk = jest.fn()
+    const findByPk = jest.spyOn(userModelMock, 'findByPk')
 
     beforeEach(() => {
-      scope.mockReset()
-      scope.mockReturnValue({ findByPk })
       findByPk.mockReset()
     })
 
     it('returns null if no user found', async () => {
       findByPk.mockReturnValue(null)
       await expect(userRepo.findById(2)).resolves.toBeNull()
-      await expect(scope).toHaveBeenCalledWith('useMasterDb')
     })
 
     it('returns user without urls if such a user found', async () => {
@@ -65,7 +61,6 @@ describe('UserRepository', () => {
         ...user,
         urls: undefined,
       })
-      await expect(scope).toHaveBeenCalledWith('useMasterDb')
     })
 
     it('returns user with urls if such a user found', async () => {
@@ -80,17 +75,13 @@ describe('UserRepository', () => {
         email: user.email,
         urls: [expectedUrl],
       })
-      await expect(scope).toHaveBeenCalledWith('useMasterDb')
     })
   })
 
   describe('findByEmail', () => {
-    const { scope } = userModelMock
-    const findOne = jest.fn()
+    const findOne = jest.spyOn(userModelMock, 'findOne')
 
     beforeEach(() => {
-      scope.mockReset()
-      scope.mockReturnValue({ findOne })
       findOne.mockReset()
     })
 
@@ -99,7 +90,6 @@ describe('UserRepository', () => {
       await expect(
         userRepo.findByEmail('[email protected]'),
       ).resolves.toBeNull()
-      await expect(scope).toBeCalledWith('useMasterDb')
     })
 
     it('returns user without urls if such a user found', async () => {
@@ -114,7 +104,6 @@ describe('UserRepository', () => {
         ...user,
         urls: undefined,
       })
-      await expect(scope).toBeCalledWith('useMasterDb')
     })
 
     it('returns user with urls if such a user found', async () => {
@@ -131,27 +120,23 @@ describe('UserRepository', () => {
         email: user.email,
         urls: [expectedUrl],
       })
-      await expect(scope).toBeCalledWith('useMasterDb')
     })
   })
 
   describe('findOrCreateByEmail', () => {
-    const { scope } = userModelMock
-    const findOrCreate = jest.fn()
+    const findOrCreate = jest.spyOn(userModelMock, 'findOrCreate')
 
     beforeEach(() => {
-      scope.mockReset()
-      scope.mockReturnValue({ findOrCreate })
       findOrCreate.mockReset()
     })
 
     it('directs findOrCreateWithEmail to User.findOrCreate', async () => {
-      const userObject = { email: '[email protected]' }
-      findOrCreate.mockResolvedValue([userObject, null])
+      const findOrCreate = jest.spyOn(userModelMock, 'findOrCreate')
+      const user = userModelMock.findOne()
+      findOrCreate.mockResolvedValue([user, null])
       await expect(
         userRepo.findOrCreateWithEmail('[email protected]'),
-      ).resolves.toBe(userObject)
-      await expect(scope).toHaveBeenCalledWith('useMasterDb')
+      ).resolves.toBe(user)
     })
   })
 
@@ -171,7 +156,7 @@ describe('UserRepository', () => {
         userRepo.findOneUrlForUser(2, expectedUrl.shortUrl),
       ).resolves.toBeNull()
       expect(scope).toHaveBeenCalledWith([
-        { method: ['useMasterDb'] },
+        { method: ['defaultScope'] },
         {
           method: ['includeShortUrl', expectedUrl.shortUrl],
         },
@@ -186,7 +171,7 @@ describe('UserRepository', () => {
         userRepo.findOneUrlForUser(2, expectedUrl.shortUrl),
       ).resolves.toStrictEqual(expectedUrl)
       expect(scope).toHaveBeenCalledWith([
-        { method: ['useMasterDb'] },
+        { method: ['defaultScope'] },
         {
           method: ['includeShortUrl', expectedUrl.shortUrl],
         },
@@ -217,7 +202,7 @@ describe('UserRepository', () => {
         expect.objectContaining({ id: user.id, email: user.email }),
       )
       expect(scope).toHaveBeenCalledWith([
-        { method: ['useMasterDb'] },
+        { method: ['defaultScope'] },
         {
           method: ['includeShortUrl', expectedUrl.shortUrl],
         },
@@ -251,7 +236,7 @@ describe('UserRepository', () => {
         NotFoundError,
       )
       expect(scope).toHaveBeenCalledWith([
-        { method: ['useMasterDb'] },
+        { method: ['defaultScope'] },
         {
           method: ['urlsWithQueryConditions', conditions],
         },
@@ -264,7 +249,7 @@ describe('UserRepository', () => {
         NotFoundError,
       )
       expect(scope).toHaveBeenCalledWith([
-        { method: ['useMasterDb'] },
+        { method: ['defaultScope'] },
         {
           method: ['urlsWithQueryConditions', conditions],
         },
@@ -281,7 +266,7 @@ describe('UserRepository', () => {
         },
       )
       expect(scope).toHaveBeenCalledWith([
-        { method: ['useMasterDb'] },
+        { method: ['defaultScope'] },
         {
           method: ['urlsWithQueryConditions', conditions],
         },
@@ -298,7 +283,7 @@ describe('UserRepository', () => {
         },
       )
       expect(scope).toHaveBeenCalledWith([
-        { method: ['useMasterDb'] },
+        { method: ['defaultScope'] },
         {
           method: ['urlsWithQueryConditions', conditions],
         },