Migrate jest new configuration

smileluo · Dec 16, 2018 · 243a5b6 · 243a5b6
1 parent cf43c19
commit 243a5b6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 38 deletions.
diff --git a/.jest.js b/.jest.js
@@ -7,25 +7,10 @@ const transformIgnorePatterns = [
 
 module.exports = {
   verbose: true,
-  setupFiles: [
-    './tests/setup.js',
-  ],
-  moduleFileExtensions: [
-    'ts',
-    'tsx',
-    'js',
-    'jsx',
-    'json',
-    'md',
-  ],
-  modulePathIgnorePatterns: [
-    '/_site/',
-  ],
-  testPathIgnorePatterns: [
-    '/node_modules/',
-    'dekko',
-    'node',
-  ],
+  setupFiles: ['./tests/setup.js'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'md'],
+  modulePathIgnorePatterns: ['/_site/'],
+  testPathIgnorePatterns: ['/node_modules/', 'dekko', 'node'],
   transform: {
     '\\.tsx?$': './node_modules/antd-tools/lib/jest/codePreprocessor',
     '\\.js$': './node_modules/antd-tools/lib/jest/codePreprocessor',
@@ -41,12 +26,10 @@ module.exports = {
     '!components/**/*/interface.{ts,tsx}',
   ],
   transformIgnorePatterns,
-  snapshotSerializers: [
-    'enzyme-to-json/serializer',
-  ],
+  snapshotSerializers: ['enzyme-to-json/serializer'],
   globals: {
     'ts-jest': {
-      tsConfigFile: './tsconfig.test.json',
+      tsConfig: './tsconfig.test.json',
     },
   },
   testURL: 'http://localhost',

diff --git a/.jest.node.js b/.jest.node.js
@@ -1,27 +1,19 @@
-// jest config for server render environment
+const libDir = process.env.LIB_DIR;
+
 module.exports = {
-  setupFiles: [
-    './tests/setup.js',
-  ],
-  moduleFileExtensions: [
-    'ts',
-    'tsx',
-    'js',
-    'md',
-  ],
+  setupFiles: ['./tests/setup.js'],
+  moduleFileExtensions: ['js', 'md', 'ts', 'tsx'],
   transform: {
     '\\.tsx?$': './node_modules/antd-tools/lib/jest/codePreprocessor',
     '\\.js$': './node_modules/antd-tools/lib/jest/codePreprocessor',
     '\\.md$': './node_modules/antd-tools/lib/jest/demoPreprocessor',
   },
-  testRegex: 'demo\\.test\\.js$',
+  testRegex: `${libDir === 'dist' ? 'demo' : '.*'}\\.test\\.js$`,
   testEnvironment: 'node',
-  snapshotSerializers: [
-    'enzyme-to-json/serializer',
-  ],
+  snapshotSerializers: ['enzyme-to-json/serializer'],
   globals: {
     'ts-jest': {
-      tsConfigFile: './tsconfig.test.json',
+      tsConfig: './tsconfig.test.json',
     },
   },
 };