Răsfoiți Sursa

fix import lines

Yuki Takei 4 ani în urmă
părinte
comite
d45f6f54e0

+ 1 - 1
packages/app/src/server/routes/apiv3/notification-setting.js

@@ -1,4 +1,5 @@
 import loggerFactory from '~/utils/logger';
+import { removeNullPropertyFromObject } from '~/utils/object-utils';
 
 // eslint-disable-next-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:notification-setting');
@@ -10,7 +11,6 @@ const router = express.Router();
 const { body } = require('express-validator');
 
 const ErrorV3 = require('../../models/vo/error-apiv3');
-const removeNullPropertyFromObject = require('../../../lib/util/removeNullPropertyFromObject');
 
 const validator = {
   slackConfiguration: [

+ 1 - 1
packages/app/src/server/routes/apiv3/response.js

@@ -1,4 +1,4 @@
-const toArrayIfNot = require('../../../lib/util/toArrayIfNot');
+import { toArrayIfNot } from '~/utils/array-utils';
 
 const ErrorV3 = require('../../models/vo/error-apiv3');
 

+ 17 - 8
packages/app/src/test/global-setup.js

@@ -1,15 +1,24 @@
-require('module-alias/register');
+/** **********************************************************
+ *                           Caution
+ *
+ * Module aliases by compilerOptions.paths in tsconfig.json
+ * are NOT available in setup scripts
+ *********************************************************** */
+
+import 'tsconfig-paths/register';
+
+import mongoose from 'mongoose';
+
+import { getMongoUri, mongoOptions } from '~/server/util/mongoose-utils';
 
 // check env
 if (process.env.NODE_ENV !== 'test') {
   throw new Error('\'process.env.NODE_ENV\' must be \'test\'');
 }
 
-const mongoose = require('mongoose');
-
-const { getMongoUri, mongoOptions } = require('../lib/util/mongoose-utils');
 
-const { getInstance } = require('./setup-crowi');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+// const { getInstance } = require('./setup-crowi');
 
 module.exports = async() => {
   await mongoose.connect(getMongoUri(), mongoOptions);
@@ -18,9 +27,9 @@ module.exports = async() => {
   await mongoose.connection.dropDatabase();
 
   // init DB
-  const crowi = await getInstance();
-  const appService = crowi.appService;
-  await appService.initDB();
+  // const crowi = await getInstance();
+  // const appService = crowi.appService;
+  // await appService.initDB();
 
   await mongoose.disconnect();
 };