fix test

packages/app/src/test/middlewares/access-token-parser.test.js

@@ -9,7 +9,7 @@ describe('accessTokenParser', () => {
   let User;
   let targetUser;
 
-  beforeAll(async(done) => {
+  beforeAll(async() => {
     crowi = await getInstance();
     User = mongoose.model('User');
     accessTokenParser = require('~/server/middlewares/access-token-parser')(crowi);
@@ -21,9 +21,6 @@ describe('accessTokenParser', () => {
       lang: 'en_US',
       apiToken: 'N4xPDjh48TBsC7ahUN+ajjL5asnGpwtA5VAR+EhIDeg=',
     });
-
-
-    done();
   });
 
   crowi = {

packages/app/src/test/middlewares/login-required.test.js

@@ -10,12 +10,11 @@ describe('loginRequired', () => {
   let loginRequired;
   let loginRequiredWithFallback;
 
-  beforeEach(async(done) => {
+  beforeEach(async() => {
     crowi = await getInstance();
     loginRequiredStrictly = require('~/server/middlewares/login-required')(crowi);
     loginRequired = require('~/server/middlewares/login-required')(crowi, true);
     loginRequiredWithFallback = require('~/server/middlewares/login-required')(crowi, false, fallbackMock);
-    done();
   });
 
   describe('not strict mode', () => {
@@ -92,12 +91,11 @@ describe('loginRequired', () => {
 
     let isGuestAllowedToReadSpy;
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       // reset session object
       req.session = {};
       // spy for AclService.isGuestAllowedToRead
       isGuestAllowedToReadSpy = jest.spyOn(crowi.aclService, 'isGuestAllowedToRead');
-      done();
     });
 
     test('send status 403 when \'req.path\' starts with \'_api\'', () => {
@@ -210,13 +208,12 @@ describe('loginRequired', () => {
 
     let isGuestAllowedToReadSpy;
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       // reset session object
       req.session = {};
       // spy for AclService.isGuestAllowedToRead
       isGuestAllowedToReadSpy = jest.spyOn(crowi.aclService, 'isGuestAllowedToRead');
-      done();
-    });
+          });
 
     test('invoke fallback when \'req.path\' starts with \'_api\'', () => {
       req.path = '/_api/someapi';

packages/app/src/test/middlewares/safe-redirect.test.js

@@ -8,9 +8,8 @@ describe('safeRedirect', () => {
     'white2.example.com',
   ];
 
-  beforeEach(async(done) => {
+  beforeEach(async() => {
     registerSafeRedirect = require('~/server/middlewares/safe-redirect')(whitelistOfHosts);
-    done();
   });
 
   describe('res.safeRedirect', () => {

packages/app/src/test/models/config.test.js

@@ -4,9 +4,8 @@ describe('Config model test', () => {
   // eslint-disable-next-line no-unused-vars
   let crowi;
 
-  beforeAll(async(done) => {
+  beforeAll(async() => {
     crowi = await getInstance();
-    done();
   });
 
   describe('.CONSTANTS', () => {

packages/app/src/test/models/page.test.js

@@ -17,7 +17,7 @@ describe('Page', () => {
   let UserGroup;
   let UserGroupRelation;
 
-  beforeAll(async(done) => {
+  beforeAll(async() => {
     crowi = await getInstance();
 
     User = mongoose.model('User');
@@ -122,8 +122,6 @@ describe('Page', () => {
     ]);
 
     parentPage = await Page.findOne({ path: '/grant' });
-
-    done();
   });
 
   describe('.isPublic', () => {

packages/app/src/test/models/share-link.test.js

@@ -6,13 +6,10 @@ describe('ShareLink', () => {
   let ShareLink;
   let Page;
 
-  beforeAll(async(done) => {
+  beforeAll(async() => {
     crowi = await getInstance();
     ShareLink = crowi.model('ShareLink');
     Page = require('~/server/routes/page')(crowi);
-
-
-    done();
   });
 
   describe('accessShareLink', () => {

packages/app/src/test/models/update-post.test.js

@@ -7,14 +7,12 @@ describe('UpdatePost', () => {
   let crowi;
   let UpdatePost;
 
-  beforeAll(async(done) => {
+  beforeAll(async() => {
     crowi = await getInstance();
-    done();
   });
 
-  beforeEach(async(done) => {
+  beforeEach(async() => {
     UpdatePost = mongoose.model('UpdatePost');
-    done();
   });
 
   describe('.createPrefixesByPathPattern', () => {

packages/app/src/test/models/user.test.js

@@ -8,7 +8,7 @@ describe('User', () => {
   let crowi;
   let User;
 
-  beforeAll(async(done) => {
+  beforeAll(async() => {
     crowi = await getInstance();
     User = mongoose.model('User');
 
@@ -19,8 +19,6 @@ describe('User', () => {
       password: 'usertestpass',
       lang: 'en_US',
     });
-
-    done();
   });
 
   describe('Create and Find.', () => {

packages/app/src/test/service/acl.test.js

@@ -5,10 +5,9 @@ describe('AclService test', () => {
 
   const initialEnv = process.env;
 
-  beforeEach(async(done) => {
+  beforeEach(async() => {
     crowi = await getInstance();
     process.env = initialEnv;
-    done();
   });
 
 
@@ -129,10 +128,9 @@ describe('AclService test', () => {
   describe('isGuestAllowedToRead()', () => {
     let getConfigSpy;
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       // prepare spy for ConfigManager.getConfig
       getConfigSpy = jest.spyOn(crowi.configManager, 'getConfig');
-      done();
     });
 
     test('to be false when FORCE_WIKI_MODE=private', async() => {

packages/app/src/test/service/config-manager.test.js

@@ -16,9 +16,8 @@ describe('ConfigManager test', () => {
 
   describe('updateConfigsInTheSameNamespace()', () => {
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       configManager.s2sMessagingService = {};
-      done();
     });
 
     test('invoke publishUpdateMessage()', async() => {

packages/app/src/test/service/page.test.js

@@ -49,7 +49,7 @@ describe('PageService', () => {
   let ShareLink;
   let xssSpy;
 
-  beforeAll(async(done) => {
+  beforeAll(async() => {
     crowi = await getInstance();
 
     User = mongoose.model('User');
@@ -230,9 +230,6 @@ describe('PageService', () => {
     ]);
 
     xssSpy = jest.spyOn(crowi.xss, 'process').mockImplementation(path => path);
-
-
-    done();
   });
 
   describe('rename page', () => {
@@ -243,10 +240,9 @@ describe('PageService', () => {
     const dateToUse = new Date();
     const socketClientId = null;
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       pageEventSpy = jest.spyOn(crowi.pageService.pageEvent, 'emit').mockImplementation();
       renameDescendantsWithStreamSpy = jest.spyOn(crowi.pageService, 'renameDescendantsWithStream').mockImplementation();
-      done();
     });
 
     describe('renamePage()', () => {
@@ -408,9 +404,8 @@ describe('PageService', () => {
     const { serializePageSecurely } = require('../../server/models/serializers/page-serializer');
     serializePageSecurely.mockImplementation(page => page);
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       duplicateDescendantsWithStreamSpy = jest.spyOn(crowi.pageService, 'duplicateDescendantsWithStream').mockImplementation();
-      done();
     });
 
     test('duplicate page (isRecursively: false)', async() => {
@@ -491,12 +486,11 @@ describe('PageService', () => {
     const dateToUse = new Date('2000-01-01');
     const socketClientId = null;
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       jest.spyOn(global.Date, 'now').mockImplementation(() => dateToUse);
       getDeletedPageNameSpy = jest.spyOn(Page, 'getDeletedPageName');
       pageEventSpy = jest.spyOn(crowi.pageService.pageEvent, 'emit');
       deleteDescendantsWithStreamSpy = jest.spyOn(crowi.pageService, 'deleteDescendantsWithStream').mockImplementation();
-      done();
     });
 
     test('delete page without options', async() => {
@@ -593,7 +587,7 @@ describe('PageService', () => {
     let deleteManyPageSpy;
     let removeAllAttachmentsSpy;
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       pageEventSpy = jest.spyOn(crowi.pageService.pageEvent, 'emit');
       deleteCompletelyOperationSpy = jest.spyOn(crowi.pageService, 'deleteCompletelyOperation');
       deleteCompletelyDescendantsWithStreamSpy = jest.spyOn(crowi.pageService, 'deleteCompletelyDescendantsWithStream').mockImplementation();
@@ -605,7 +599,6 @@ describe('PageService', () => {
       deleteManyRevisionSpy = jest.spyOn(Revision, 'deleteMany').mockImplementation();
       deleteManyPageSpy = jest.spyOn(Page, 'deleteMany').mockImplementation();
       removeAllAttachmentsSpy = jest.spyOn(crowi.attachmentService, 'removeAllAttachments').mockImplementation();
-      done();
     });
     test('deleteCompletelyOperation', async() => {
       await crowi.pageService.deleteCompletelyOperation([parentForDeleteCompletely._id], [parentForDeleteCompletely.path], { });
@@ -650,11 +643,10 @@ describe('PageService', () => {
     let deleteCompletelySpy;
     let revertDeletedDescendantsWithStreamSpy;
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       getRevertDeletedPageNameSpy = jest.spyOn(Page, 'getRevertDeletedPageName');
       deleteCompletelySpy = jest.spyOn(crowi.pageService, 'deleteCompletely').mockImplementation();
       revertDeletedDescendantsWithStreamSpy = jest.spyOn(crowi.pageService, 'revertDeletedDescendantsWithStream').mockImplementation();
-      done();
     });
 
     test('revert deleted page when the redirect from page exists', async() => {

packages/app/src/test/service/passport.test.js

@@ -3,9 +3,8 @@ const { getInstance } = require('../setup-crowi');
 describe('PassportService test', () => {
   let crowi;
 
-  beforeEach(async(done) => {
+  beforeEach(async() => {
     crowi = await getInstance();
-    done();
   });
 
 
@@ -14,12 +13,11 @@ describe('PassportService test', () => {
     let getConfigSpy;
     let extractAttributesFromSAMLResponseSpy;
 
-    beforeEach(async(done) => {
+    beforeEach(async() => {
       // prepare spy for ConfigManager.getConfig
       getConfigSpy = jest.spyOn(crowi.configManager, 'getConfig');
       // prepare spy for extractAttributesFromSAMLResponse method
       extractAttributesFromSAMLResponseSpy = jest.spyOn(crowi.passportService, 'extractAttributesFromSAMLResponse');
-      done();
     });
 
     /* eslint-disable indent */

packages/app/src/test/utils/slack-legacy.test.js

@@ -5,10 +5,9 @@ describe('Slack Util', () => {
   let crowi;
   let slackLegacy;
 
-  beforeEach(async(done) => {
+  beforeEach(async() => {
     crowi = await getInstance();
     slackLegacy = require('~/server/util/slack-legacy')(crowi);
-    done();
   });
 
   test('post comment method exists', () => {