Browse Source

reorganize test files

Yuki Takei 4 years ago
parent
commit
e14425c4d3
26 changed files with 15 additions and 15 deletions
  1. 7 12
      packages/app/jest.config.js
  2. 1 1
      packages/app/test/cypress/tsconfig.json
  3. 0 0
      packages/app/test/integration/crowi/crowi.test.js
  4. 0 0
      packages/app/test/integration/global-setup.js
  5. 0 0
      packages/app/test/integration/global-teardown.js
  6. 0 0
      packages/app/test/integration/middlewares/access-token-parser.test.js
  7. 0 0
      packages/app/test/integration/middlewares/login-required.test.js
  8. 1 1
      packages/app/test/integration/migrations/20210913153942-migrate-slack-app-integration-schema.test.ts
  9. 0 0
      packages/app/test/integration/models/config.test.js
  10. 0 0
      packages/app/test/integration/models/page.test.js
  11. 0 0
      packages/app/test/integration/models/share-link.test.js
  12. 0 0
      packages/app/test/integration/models/update-post.test.js
  13. 0 0
      packages/app/test/integration/models/user.test.js
  14. 0 0
      packages/app/test/integration/service/acl.test.js
  15. 0 0
      packages/app/test/integration/service/config-manager.test.js
  16. 0 0
      packages/app/test/integration/service/page.test.js
  17. 0 0
      packages/app/test/integration/service/passport.test.js
  18. 0 0
      packages/app/test/integration/service/search/search-service.test.js
  19. 0 0
      packages/app/test/integration/setup-crowi.js
  20. 0 0
      packages/app/test/integration/setup.js
  21. 0 0
      packages/app/test/integration/utils/slack-legacy.test.js
  22. 6 0
      packages/app/test/tsconfig.json
  23. 0 0
      packages/app/test/unit/middlewares/safe-redirect.test.js
  24. 0 0
      packages/app/test/unit/migrate-mongo-config.test.js
  25. 0 0
      packages/app/test/unit/utils/to-array-from-csv.test.js
  26. 0 1
      packages/app/tsconfig.build.server.json

+ 7 - 12
packages/app/jest.config.js

@@ -21,8 +21,8 @@ module.exports = {
       preset: 'ts-jest/presets/js-with-ts',
       preset: 'ts-jest/presets/js-with-ts',
 
 
       rootDir: '.',
       rootDir: '.',
-      roots: ['<rootDir>/src'],
-      testMatch: ['<rootDir>/src/test/unit/**/*.test.ts', '<rootDir>/src/test/unit/**/*.test.js'],
+      roots: ['<rootDir>'],
+      testMatch: ['<rootDir>/test/unit/**/*.test.ts', '<rootDir>/test/unit/**/*.test.js'],
 
 
       testEnvironment: 'node',
       testEnvironment: 'node',
 
 
@@ -36,23 +36,18 @@ module.exports = {
       preset: 'ts-jest/presets/js-with-ts',
       preset: 'ts-jest/presets/js-with-ts',
 
 
       rootDir: '.',
       rootDir: '.',
-      roots: ['<rootDir>/src'],
-      testMatch: ['<rootDir>/src/test/integration/**/*.test.ts', '<rootDir>/src/test/integration/**/*.test.js'],
+      roots: ['<rootDir>'],
+      testMatch: ['<rootDir>/test/integration/**/*.test.ts', '<rootDir>/test/integration/**/*.test.js'],
 
 
       testEnvironment: 'node',
       testEnvironment: 'node',
-      globalSetup: '<rootDir>/src/test/integration/global-setup.js',
-      globalTeardown: '<rootDir>/src/test/integration/global-teardown.js',
-      setupFilesAfterEnv: ['<rootDir>/src/test/integration/setup.js'],
+      globalSetup: '<rootDir>/test/integration/global-setup.js',
+      globalTeardown: '<rootDir>/test/integration/global-teardown.js',
+      setupFilesAfterEnv: ['<rootDir>/test/integration/setup.js'],
 
 
       // Automatically clear mock calls and instances between every test
       // Automatically clear mock calls and instances between every test
       clearMocks: true,
       clearMocks: true,
       moduleNameMapper: MODULE_NAME_MAPPING,
       moduleNameMapper: MODULE_NAME_MAPPING,
     },
     },
-    // {
-    //   displayName: 'client',
-    //   rootDir: '.',
-    //   testMatch: ['<rootDir>/src/test/client/**/*.test.js'],
-    // },
   ],
   ],
 
 
   // Automatically clear mock calls and instances between every test
   // Automatically clear mock calls and instances between every test

+ 1 - 1
packages/app/test/cypress/tsconfig.json

@@ -1,5 +1,5 @@
 {
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
   "compilerOptions": {
     "noEmit": true,
     "noEmit": true,
     // be explicit about types included
     // be explicit about types included

+ 0 - 0
packages/app/src/test/integration/crowi/crowi.test.js → packages/app/test/integration/crowi/crowi.test.js


+ 0 - 0
packages/app/src/test/integration/global-setup.js → packages/app/test/integration/global-setup.js


+ 0 - 0
packages/app/src/test/integration/global-teardown.js → packages/app/test/integration/global-teardown.js


+ 0 - 0
packages/app/src/test/integration/middlewares/access-token-parser.test.js → packages/app/test/integration/middlewares/access-token-parser.test.js


+ 0 - 0
packages/app/src/test/integration/middlewares/login-required.test.js → packages/app/test/integration/middlewares/login-required.test.js


+ 1 - 1
packages/app/src/test/integration/migrations/20210913153942-migrate-slack-app-integration-schema.test.ts → packages/app/test/integration/migrations/20210913153942-migrate-slack-app-integration-schema.test.ts

@@ -2,7 +2,7 @@ import mongoose from 'mongoose';
 import { Collection } from 'mongodb';
 import { Collection } from 'mongodb';
 import { getMongoUri, mongoOptions } from '@growi/core';
 import { getMongoUri, mongoOptions } from '@growi/core';
 
 
-const migrate = require('../../../migrations/20210913153942-migrate-slack-app-integration-schema');
+const migrate = require('~/migrations/20210913153942-migrate-slack-app-integration-schema');
 
 
 describe('migrate-slack-app-integration-schema', () => {
 describe('migrate-slack-app-integration-schema', () => {
 
 

+ 0 - 0
packages/app/src/test/integration/models/config.test.js → packages/app/test/integration/models/config.test.js


+ 0 - 0
packages/app/src/test/integration/models/page.test.js → packages/app/test/integration/models/page.test.js


+ 0 - 0
packages/app/src/test/integration/models/share-link.test.js → packages/app/test/integration/models/share-link.test.js


+ 0 - 0
packages/app/src/test/integration/models/update-post.test.js → packages/app/test/integration/models/update-post.test.js


+ 0 - 0
packages/app/src/test/integration/models/user.test.js → packages/app/test/integration/models/user.test.js


+ 0 - 0
packages/app/src/test/integration/service/acl.test.js → packages/app/test/integration/service/acl.test.js


+ 0 - 0
packages/app/src/test/integration/service/config-manager.test.js → packages/app/test/integration/service/config-manager.test.js


+ 0 - 0
packages/app/src/test/integration/service/page.test.js → packages/app/test/integration/service/page.test.js


+ 0 - 0
packages/app/src/test/integration/service/passport.test.js → packages/app/test/integration/service/passport.test.js


+ 0 - 0
packages/app/src/test/integration/service/search/search-service.test.js → packages/app/test/integration/service/search/search-service.test.js


+ 0 - 0
packages/app/src/test/integration/setup-crowi.js → packages/app/test/integration/setup-crowi.js


+ 0 - 0
packages/app/src/test/integration/setup.js → packages/app/test/integration/setup.js


+ 0 - 0
packages/app/src/test/integration/utils/slack-legacy.test.js → packages/app/test/integration/utils/slack-legacy.test.js


+ 6 - 0
packages/app/test/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "isolatedModules": false,
+  },
+}

+ 0 - 0
packages/app/src/test/unit/middlewares/safe-redirect.test.js → packages/app/test/unit/middlewares/safe-redirect.test.js


+ 0 - 0
packages/app/src/test/unit/migrate-mongo-config.test.js → packages/app/test/unit/migrate-mongo-config.test.js


+ 0 - 0
packages/app/src/test/unit/utils/to-array-from-csv.test.js → packages/app/test/unit/utils/to-array-from-csv.test.js


+ 0 - 1
packages/app/tsconfig.build.server.json

@@ -22,6 +22,5 @@
     "src/stores",
     "src/stores",
     "src/styles",
     "src/styles",
     "src/styles-hackmd",
     "src/styles-hackmd",
-    "src/test"
   ]
   ]
 }
 }