Yuki Takei 2 месяцев назад
Родитель
Сommit
030acdd4f9

+ 2 - 2
apps/app/src/migrations/20210913153942-migrate-slack-app-integration-schema.integ.ts

@@ -1,7 +1,7 @@
 import type { Collection } from 'mongodb';
-import mongoose from 'mongoose';
+import * as mongoose from 'mongoose';
 
-import migrate from './20210913153942-migrate-slack-app-integration-schema';
+const migrate = require('./20210913153942-migrate-slack-app-integration-schema');
 
 describe('migrate-slack-app-integration-schema', () => {
   let collection: Collection;

+ 2 - 2
apps/app/src/server/crowi/index.ts

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { createTerminus } from '@godaddy/terminus';
 import attachmentRoutes from '@growi/remark-attachment-refs/dist/server';
 import lsxRoutes from '@growi/remark-lsx/dist/server/index.cjs';
-import type { Express, RequestHandler } from 'express';
+import type { Express } from 'express';
 import mongoose from 'mongoose';
 
 import { KeycloakUserGroupSyncService } from '~/features/external-user-group/server/service/keycloak-user-group-sync';
@@ -653,7 +653,7 @@ class Crowi {
    * !! this must be after the Routes setup !!
    */
   setupGlobalErrorHandlers(): void {
-    this.express.use(httpErrorHandler as RequestHandler);
+    this.express.use(httpErrorHandler);
   }
 
   /**

+ 20 - 14
apps/app/src/server/models/user/user.integ.ts

@@ -70,20 +70,26 @@ describe('User', () => {
   describe('Create and Find.', () => {
     describe('The user', () => {
       // Skip: This test requires crowi instance to generate password
-      test.skip('should created with createUserByEmailAndPassword', (done) => {
-        User.createUserByEmailAndPassword(
-          'Example2 for User Test',
-          'usertest2',
-          'usertest2@example.com',
-          'usertest2pass',
-          'en_US',
-          (err: Error | null, userData: typeof User) => {
-            expect(err).toBeNull();
-            expect(userData).toBeInstanceOf(User);
-            expect(userData.name).toBe('Example2 for User Test');
-            done();
-          },
-        );
+      test.skip('should created with createUserByEmailAndPassword', async () => {
+        await new Promise<void>((resolve, reject) => {
+          User.createUserByEmailAndPassword(
+            'Example2 for User Test',
+            'usertest2',
+            'usertest2@example.com',
+            'usertest2pass',
+            'en_US',
+            (err: Error | null, userData: typeof User) => {
+              try {
+                expect(err).toBeNull();
+                expect(userData).toBeInstanceOf(User);
+                expect(userData.name).toBe('Example2 for User Test');
+                resolve();
+              } catch (error) {
+                reject(error);
+              }
+            },
+          );
+        });
       });
 
       test('should be found by findUserByUsername', async () => {