Commit 239940c537a for woocommerce
commit 239940c537aa782c6268757445f8232fac53e41b
Author: Vladimir Reznichenko <kalessil@gmail.com>
Date: Wed Apr 15 11:52:25 2026 +0200
[dev] Monorepo: housekeeping (failing jobs, admin tests cleanup from #59334) (#64160)
diff --git a/packages/js/internal-js-tests/jest-preset.js b/packages/js/internal-js-tests/jest-preset.js
index 72f1633b1e4..c71fd931cb7 100644
--- a/packages/js/internal-js-tests/jest-preset.js
+++ b/packages/js/internal-js-tests/jest-preset.js
@@ -33,11 +33,12 @@ const mapWpModules = [
'@wordpress/private-apis',
'@wordpress/core-data',
'@wordpress/components',
+ '@wordpress/html-entities',
];
const wpModulesMapper = mapWpModules.reduce( ( acc, module ) => {
try {
// Excluding mappings for imports with suffixes like /build/index.js so that we can import the build/index.js file directly.
- acc[ `^${ module }$` ] = require.resolve( module );
+ acc[ `^${ module }$` ] = require.resolve( module, { paths: [ process.cwd() ] } );
} catch ( error ) {
// If the module is not found, no need to add it to the mapper.
}
diff --git a/plugins/woocommerce/client/admin/client/blueprint/components/tests/get-option-groups.test.js b/plugins/woocommerce/client/admin/client/blueprint/components/test/get-option-groups.test.js
similarity index 100%
rename from plugins/woocommerce/client/admin/client/blueprint/components/tests/get-option-groups.test.js
rename to plugins/woocommerce/client/admin/client/blueprint/components/test/get-option-groups.test.js
diff --git a/plugins/woocommerce/client/admin/client/core-profiler/pages/Plugins/tests/NoPermissions.test.tsx b/plugins/woocommerce/client/admin/client/core-profiler/pages/Plugins/test/NoPermissions.test.tsx
similarity index 100%
rename from plugins/woocommerce/client/admin/client/core-profiler/pages/Plugins/tests/NoPermissions.test.tsx
rename to plugins/woocommerce/client/admin/client/core-profiler/pages/Plugins/test/NoPermissions.test.tsx
diff --git a/plugins/woocommerce/client/admin/client/core-profiler/pages/Plugins/tests/Plugins.test.tsx b/plugins/woocommerce/client/admin/client/core-profiler/pages/Plugins/test/Plugins.test.tsx
similarity index 100%
rename from plugins/woocommerce/client/admin/client/core-profiler/pages/Plugins/tests/Plugins.test.tsx
rename to plugins/woocommerce/client/admin/client/core-profiler/pages/Plugins/test/Plugins.test.tsx
diff --git a/plugins/woocommerce/client/admin/client/hooks/tests/use-tasklists-state.test.ts b/plugins/woocommerce/client/admin/client/hooks/test/use-tasklists-state.test.ts
similarity index 100%
rename from plugins/woocommerce/client/admin/client/hooks/tests/use-tasklists-state.test.ts
rename to plugins/woocommerce/client/admin/client/hooks/test/use-tasklists-state.test.ts
diff --git a/plugins/woocommerce/client/admin/client/marketing/components/CollapsibleCard/CollapsibleCard.test.tsx b/plugins/woocommerce/client/admin/client/marketing/components/CollapsibleCard/test/CollapsibleCard.test.tsx
similarity index 95%
rename from plugins/woocommerce/client/admin/client/marketing/components/CollapsibleCard/CollapsibleCard.test.tsx
rename to plugins/woocommerce/client/admin/client/marketing/components/CollapsibleCard/test/CollapsibleCard.test.tsx
index d320c659064..6da3d5e675f 100644
--- a/plugins/woocommerce/client/admin/client/marketing/components/CollapsibleCard/CollapsibleCard.test.tsx
+++ b/plugins/woocommerce/client/admin/client/marketing/components/CollapsibleCard/test/CollapsibleCard.test.tsx
@@ -7,7 +7,7 @@ import userEvent from '@testing-library/user-event';
/**
* Internal dependencies
*/
-import { CollapsibleCard } from './CollapsibleCard';
+import { CollapsibleCard } from '../CollapsibleCard';
const header = 'Card header';
const body = 'Card body';
diff --git a/plugins/woocommerce/client/admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.test.tsx b/plugins/woocommerce/client/admin/client/marketing/components/CreateNewCampaignModal/test/CreateNewCampaignModal.test.tsx
similarity index 98%
rename from plugins/woocommerce/client/admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.test.tsx
rename to plugins/woocommerce/client/admin/client/marketing/components/CreateNewCampaignModal/test/CreateNewCampaignModal.test.tsx
index 486631e197a..d9319aa1469 100644
--- a/plugins/woocommerce/client/admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.test.tsx
+++ b/plugins/woocommerce/client/admin/client/marketing/components/CreateNewCampaignModal/test/CreateNewCampaignModal.test.tsx
@@ -8,7 +8,7 @@ import userEvent from '@testing-library/user-event';
* Internal dependencies
*/
import { useCampaignTypes, useRecommendedChannels } from '~/marketing/hooks';
-import { CreateNewCampaignModal } from './CreateNewCampaignModal';
+import { CreateNewCampaignModal } from '../CreateNewCampaignModal';
jest.mock( '@woocommerce/components', () => {
const originalModule = jest.requireActual( '@woocommerce/components' );
diff --git a/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/Campaigns/Campaigns.test.tsx b/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/Campaigns/test/Campaigns.test.tsx
similarity index 99%
rename from plugins/woocommerce/client/admin/client/marketing/overview-multichannel/Campaigns/Campaigns.test.tsx
rename to plugins/woocommerce/client/admin/client/marketing/overview-multichannel/Campaigns/test/Campaigns.test.tsx
index e281b8306e8..1dccd2cf2d8 100644
--- a/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/Campaigns/Campaigns.test.tsx
+++ b/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/Campaigns/test/Campaigns.test.tsx
@@ -8,7 +8,7 @@ import userEvent from '@testing-library/user-event';
* Internal dependencies
*/
import { useCampaignTypes, useCampaigns } from '~/marketing/hooks';
-import { Campaigns } from './Campaigns';
+import { Campaigns } from '../Campaigns';
jest.mock( '~/marketing/hooks', () => ( {
useCampaigns: jest.fn(),
diff --git a/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/DiscoverTools/DiscoverTools.test.tsx b/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/DiscoverTools/test/DiscoverTools.test.tsx
similarity index 95%
rename from plugins/woocommerce/client/admin/client/marketing/overview-multichannel/DiscoverTools/DiscoverTools.test.tsx
rename to plugins/woocommerce/client/admin/client/marketing/overview-multichannel/DiscoverTools/test/DiscoverTools.test.tsx
index a205fccb4a2..c98db8886be 100644
--- a/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/DiscoverTools/DiscoverTools.test.tsx
+++ b/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/DiscoverTools/test/DiscoverTools.test.tsx
@@ -6,8 +6,8 @@ import { render, screen } from '@testing-library/react';
/**
* Internal dependencies
*/
-import { useRecommendedPluginsWithoutChannels } from './useRecommendedPluginsWithoutChannels';
-import { DiscoverTools } from './DiscoverTools';
+import { useRecommendedPluginsWithoutChannels } from '../useRecommendedPluginsWithoutChannels';
+import { DiscoverTools } from '../DiscoverTools';
jest.mock( '@woocommerce/components', () => {
const originalModule = jest.requireActual( '@woocommerce/components' );
@@ -19,7 +19,7 @@ jest.mock( '@woocommerce/components', () => {
};
} );
-jest.mock( './useRecommendedPluginsWithoutChannels', () => ( {
+jest.mock( '../useRecommendedPluginsWithoutChannels', () => ( {
useRecommendedPluginsWithoutChannels: jest.fn(),
} ) );
diff --git a/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/LearnMarketing/LearnMarketing.test.tsx b/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/LearnMarketing/test/LearnMarketing.test.tsx
similarity index 97%
rename from plugins/woocommerce/client/admin/client/marketing/overview-multichannel/LearnMarketing/LearnMarketing.test.tsx
rename to plugins/woocommerce/client/admin/client/marketing/overview-multichannel/LearnMarketing/test/LearnMarketing.test.tsx
index fac63a1f58c..ee6312adb33 100644
--- a/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/LearnMarketing/LearnMarketing.test.tsx
+++ b/plugins/woocommerce/client/admin/client/marketing/overview-multichannel/LearnMarketing/test/LearnMarketing.test.tsx
@@ -7,10 +7,10 @@ import userEvent from '@testing-library/user-event';
/**
* Internal dependencies
*/
-import { useBlogPosts } from './useBlogPosts';
-import { LearnMarketing } from './LearnMarketing';
+import { useBlogPosts } from '../useBlogPosts';
+import { LearnMarketing } from '../LearnMarketing';
-jest.mock( './useBlogPosts', () => ( {
+jest.mock( '../useBlogPosts', () => ( {
useBlogPosts: jest.fn(),
} ) );
diff --git a/plugins/woocommerce/client/admin/client/marketing/utils/getRecommendationSource.test.ts b/plugins/woocommerce/client/admin/client/marketing/utils/test/getRecommendationSource.test.ts
similarity index 93%
rename from plugins/woocommerce/client/admin/client/marketing/utils/getRecommendationSource.test.ts
rename to plugins/woocommerce/client/admin/client/marketing/utils/test/getRecommendationSource.test.ts
index b8875a9385a..6c584fde791 100644
--- a/plugins/woocommerce/client/admin/client/marketing/utils/getRecommendationSource.test.ts
+++ b/plugins/woocommerce/client/admin/client/marketing/utils/test/getRecommendationSource.test.ts
@@ -2,7 +2,7 @@
* Internal dependencies
*/
import { getAdminSetting } from '~/utils/admin-settings';
-import { getRecommendationSource } from './getRecommendationSource';
+import { getRecommendationSource } from '../getRecommendationSource';
jest.mock( '~/utils/admin-settings', () => ( {
getAdminSetting: jest.fn(),
diff --git a/plugins/woocommerce/client/blocks/tests/js/jest.config.json b/plugins/woocommerce/client/blocks/tests/js/jest.config.json
index 0207c4da582..a73feac8f69 100644
--- a/plugins/woocommerce/client/blocks/tests/js/jest.config.json
+++ b/plugins/woocommerce/client/blocks/tests/js/jest.config.json
@@ -13,8 +13,9 @@
"@wordpress/core-data/build/(.*)$": "<rootDir>/node_modules/@wordpress/core-data/build/$1",
"@wordpress/core-data": "<rootDir>/node_modules/@wordpress/core-data",
"@wordpress/components": "<rootDir>/node_modules/@wordpress/components",
+ "@wordpress/html-entities": "<rootDir>/node_modules/@wordpress/html-entities",
"@woocommerce/data": "<rootDir>/node_modules/@woocommerce/data/build",
- "@woocommerce/sanitize": "<rootDir>/node_modules/@woocommerce/sanitize/src/index.ts",
+ "@woocommerce/sanitize": "<rootDir>/node_modules/@woocommerce/sanitize/src",
"@woocommerce/atomic-blocks": "assets/js/atomic/blocks",
"@woocommerce/atomic-utils": "assets/js/atomic/utils",
"@woocommerce/icons": "assets/js/icons",
@@ -39,7 +40,6 @@
"@woocommerce/shared-hocs": "assets/js/shared/hocs",
"@woocommerce/blocks-test-utils/(.*)$": "tests/utils/$1",
"@woocommerce/blocks-test-utils": "tests/utils",
- "@woocommerce/sanitize": "<rootDir>/node_modules/@woocommerce/sanitize/src",
"@woocommerce/types": "assets/js/types",
"@woocommerce/utils": "assets/js/utils",
"@woocommerce/test-utils/msw": "tests/js/config/msw-setup.js",
diff --git a/plugins/woocommerce/client/blocks/tsconfig.base.json b/plugins/woocommerce/client/blocks/tsconfig.base.json
index 3d46cf08100..bd776970083 100644
--- a/plugins/woocommerce/client/blocks/tsconfig.base.json
+++ b/plugins/woocommerce/client/blocks/tsconfig.base.json
@@ -162,7 +162,7 @@
],
"dinero.js/currencies": [
"node_modules/dinero.js/dist/esm/currencies/index.d.ts"
- ],
+ ]
}
}
}