From 243a5b60970a51596b83153ff36c97028495a3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Sun, 16 Dec 2018 11:26:36 +0800 Subject: [PATCH] Migrate jest new configuration --- .jest.js | 29 ++++++----------------------- .jest.node.js | 22 +++++++--------------- 2 files changed, 13 insertions(+), 38 deletions(-) diff --git a/.jest.js b/.jest.js index 8f29b75747..53c4b4b1f6 100644 --- 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 index 4065b36ef2..9a3cbc1aaa 100644 --- 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', }, }, };