Просмотр исходного кода

support: Reorganize tests (#4412)

* reorganize tests

* reorganize tests
Yuki Takei 4 лет назад
Родитель
Сommit
8fc0836bc3
22 измененных файлов с 23 добавлено и 7 удалено
  1. 21 5
      packages/app/jest.config.js
  2. 0 0
      packages/app/src/test/integration/crowi/crowi.test.js
  3. 0 0
      packages/app/src/test/integration/global-setup.js
  4. 0 0
      packages/app/src/test/integration/global-teardown.js
  5. 0 0
      packages/app/src/test/integration/middlewares/access-token-parser.test.js
  6. 0 0
      packages/app/src/test/integration/middlewares/login-required.test.js
  7. 0 0
      packages/app/src/test/integration/models/config.test.js
  8. 0 0
      packages/app/src/test/integration/models/page.test.js
  9. 0 0
      packages/app/src/test/integration/models/share-link.test.js
  10. 0 0
      packages/app/src/test/integration/models/update-post.test.js
  11. 0 0
      packages/app/src/test/integration/models/user.test.js
  12. 0 0
      packages/app/src/test/integration/service/acl.test.js
  13. 0 0
      packages/app/src/test/integration/service/config-manager.test.js
  14. 2 2
      packages/app/src/test/integration/service/page.test.js
  15. 0 0
      packages/app/src/test/integration/service/passport.test.js
  16. 0 0
      packages/app/src/test/integration/service/search-delegator/searchbox.test.js
  17. 0 0
      packages/app/src/test/integration/setup-crowi.js
  18. 0 0
      packages/app/src/test/integration/setup.js
  19. 0 0
      packages/app/src/test/integration/utils/slack-legacy.test.js
  20. 0 0
      packages/app/src/test/unit/middlewares/safe-redirect.test.js
  21. 0 0
      packages/app/src/test/unit/migrate-mongo-config.test.js
  22. 0 0
      packages/app/src/test/unit/utils/to-array-from-csv.test.js

+ 21 - 5
packages/app/jest.config.js

@@ -14,10 +14,22 @@ module.exports = {
 
   preset: 'ts-jest/presets/js-with-ts',
 
-  globalSetup: '<rootDir>/src/test/global-setup.js',
-  globalTeardown: '<rootDir>/src/test/global-teardown.js',
-
   projects: [
+    {
+      displayName: 'unit',
+
+      preset: 'ts-jest/presets/js-with-ts',
+
+      rootDir: '.',
+      roots: ['<rootDir>/src'],
+      testMatch: ['<rootDir>/src/test/unit/**/*.test.ts', '<rootDir>/src/test/unit/**/*.test.js'],
+
+      testEnvironment: 'node',
+
+      // Automatically clear mock calls and instances between every test
+      clearMocks: true,
+      moduleNameMapper: MODULE_NAME_MAPPING,
+    },
     {
       displayName: 'server',
 
@@ -25,9 +37,13 @@ module.exports = {
 
       rootDir: '.',
       roots: ['<rootDir>/src'],
+      testMatch: ['<rootDir>/src/test/integration/**/*.test.ts', '<rootDir>/src/test/integration/**/*.test.js'],
+
       testEnvironment: 'node',
-      setupFilesAfterEnv: ['<rootDir>/src/test/setup.js'],
-      testMatch: ['<rootDir>/src/test/**/*.test.ts', '<rootDir>/src/test/**/*.test.js'],
+      globalSetup: '<rootDir>/src/test/integration/global-setup.js',
+      globalTeardown: '<rootDir>/src/test/integration/global-teardown.js',
+      setupFilesAfterEnv: ['<rootDir>/src/test/integration/setup.js'],
+
       // Automatically clear mock calls and instances between every test
       clearMocks: true,
       moduleNameMapper: MODULE_NAME_MAPPING,

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


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


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


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


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


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


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


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


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


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


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


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


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

@@ -505,8 +505,8 @@ describe('PageService', () => {
   describe('duplicate page', () => {
     let duplicateDescendantsWithStreamSpy;
 
-    jest.mock('../../server/models/serializers/page-serializer');
-    const { serializePageSecurely } = require('../../server/models/serializers/page-serializer');
+    jest.mock('~/server/models/serializers/page-serializer');
+    const { serializePageSecurely } = require('~/server/models/serializers/page-serializer');
     serializePageSecurely.mockImplementation(page => page);
 
     beforeEach(async() => {

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


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


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


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


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


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


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


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