Skip to content

Commit

Permalink
chore: Fix jest deprecation warnings (#2748)
Browse files Browse the repository at this point in the history
  • Loading branch information
just-boris authored Sep 20, 2024
1 parent 5a42c26 commit 7f14eff
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 28 deletions.
12 changes: 7 additions & 5 deletions jest.integ.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ const os = require('os');
module.exports = {
verbose: true,
testEnvironment: 'node',
globals: {
'ts-jest': {
tsconfig: 'tsconfig.integ.json',
},
transform: {
'^.+\\.tsx?$': [
'ts-jest',
{
tsconfig: 'tsconfig.integ.json',
},
],
},
reporters: ['default', 'github-actions'],
testTimeout: 60_000, // 1min
Expand All @@ -19,5 +22,4 @@ module.exports = {
setupFilesAfterEnv: [path.join(__dirname, 'build-tools', 'integ', 'setup.integ.js')],
moduleFileExtensions: ['js', 'ts'],
testRegex: '(/(__integ__|__a11y__)/.*(\\.|/)test)\\.[jt]sx?$',
preset: 'ts-jest',
};
17 changes: 2 additions & 15 deletions jest.motion.config.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,10 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
const path = require('path');
const os = require('os');
const integConfig = require('./jest.integ.config');

module.exports = {
verbose: true,
testEnvironment: 'node',
globals: {
'ts-jest': {
tsconfig: 'tsconfig.integ.json',
},
},
reporters: ['default', 'github-actions'],
testTimeout: 60_000, // 1min
maxWorkers: os.cpus().length * (process.env.GITHUB_ACTION ? 3 : 1),
globalSetup: '<rootDir>/build-tools/integ/global-setup.js',
globalTeardown: '<rootDir>/build-tools/integ/global-teardown.js',
...integConfig,
setupFilesAfterEnv: [path.join(__dirname, 'build-tools', 'integ', 'setup.motion.js')],
moduleFileExtensions: ['js', 'ts'],
testRegex: '(/(__motion__)/.*(\\.|/)test)\\.[jt]sx?$',
preset: 'ts-jest',
};
16 changes: 8 additions & 8 deletions jest.unit.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
const path = require('path');
const merge = require('lodash/merge');
const tsPreset = require('ts-jest/jest-preset');
const cloudscapePreset = require('@cloudscape-design/jest-preset/jest-preset');
const mergePresets = require('@cloudscape-design/jest-preset/merge');

module.exports = merge({}, tsPreset, cloudscapePreset, {
module.exports = mergePresets(cloudscapePreset, {
verbose: true,
testEnvironment: 'jsdom',
reporters: ['default', 'github-actions'],
Expand All @@ -31,16 +30,17 @@ module.exports = merge({}, tsPreset, cloudscapePreset, {
statements: 90,
},
},
globals: {
'ts-jest': {
tsconfig: 'tsconfig.unit.json',
},
},
transform: {
'(?!node_modules).*/lib/(components|design-tokens)/.*\\.js$': require.resolve(
'@cloudscape-design/jest-preset/js-transformer'
),
'(?!node_modules).*/lib/components/.*\\.css$': require.resolve('@cloudscape-design/jest-preset/css-transformer'),
'^.+\\.tsx?$': [
'ts-jest',
{
tsconfig: 'tsconfig.unit.json',
},
],
},
setupFilesAfterEnv: [path.join(__dirname, 'build-tools', 'jest', 'setup.js')],
testRegex: '(/__tests__/.*(\\.|/)test)\\.[jt]sx?$',
Expand Down

0 comments on commit 7f14eff

Please sign in to comment.