Răsfoiți Sursa

Removed unnecessary setup file

Taichi Masuyama 4 ani în urmă
părinte
comite
cc18edfdcb

+ 2 - 2
packages/app/jest.config.js

@@ -59,9 +59,9 @@ module.exports = {
       testMatch: ['<rootDir>/test/integration/**/v5.*.test.ts', '<rootDir>/test/integration/**/v5.*.test.js'],
 
       testEnvironment: 'node',
-      globalSetup: '<rootDir>/test/integration/v5-global-setup.js',
+      globalSetup: '<rootDir>/test/integration/global-setup.js',
       globalTeardown: '<rootDir>/test/integration/global-teardown.js',
-      setupFilesAfterEnv: ['<rootDir>/test/integration/v5-setup.js'],
+      setupFilesAfterEnv: ['<rootDir>/test/integration/setup.js'],
 
       // Automatically clear mock calls and instances between every test
       clearMocks: true,

+ 0 - 40
packages/app/test/integration/v5-global-setup.js

@@ -1,40 +0,0 @@
-/** **********************************************************
- *                           Caution
- *
- * Module aliases by compilerOptions.paths in tsconfig.json
- * are NOT available in setup scripts
- *********************************************************** */
-
-import 'tsconfig-paths/register';
-
-import mongoose from 'mongoose';
-
-import { initMongooseGlobalSettings, getMongoUri, mongoOptions } from '@growi/core';
-
-// check env
-if (process.env.NODE_ENV !== 'test') {
-  throw new Error('\'process.env.NODE_ENV\' must be \'test\'');
-}
-
-module.exports = async() => {
-  initMongooseGlobalSettings();
-  mongoose.connect(getMongoUri(), mongoOptions);
-
-  // drop database
-  await mongoose.connection.dropDatabase();
-
-  // init DB
-  const pageCollection = mongoose.connection.collection('pages');
-  const userCollection = mongoose.connection.collection('users');
-
-  // create global user & rootPage
-  const globalUser = (await userCollection.insertMany([{ name: 'globalUser', username: 'globalUser', email: 'globalUser@example.com' }]))[0];
-  await pageCollection.insertMany([{
-    path: '/',
-    grant: 1,
-    creator: globalUser,
-    lastUpdateUser: globalUser,
-  }]);
-
-  await mongoose.disconnect();
-};

+ 0 - 25
packages/app/test/integration/v5-setup.js

@@ -1,25 +0,0 @@
-/** **********************************************************
- *                           Caution
- *
- * Module aliases by compilerOptions.paths in tsconfig.json
- * are NOT available in setup scripts
- *********************************************************** */
-
-const mongoose = require('mongoose');
-
-const { initMongooseGlobalSettings, getMongoUri, mongoOptions } = require('@growi/core');
-
-mongoose.Promise = global.Promise;
-
-jest.setTimeout(30000); // default 5000
-
-beforeAll(async() => {
-  initMongooseGlobalSettings();
-  await mongoose.connect(getMongoUri(), mongoOptions);
-});
-
-afterAll(async() => {
-  await mongoose.disconnect();
-});
-
-module.exports = {};