feat(scripts-jest): clear and restore mocks automatically to prevent …

…accidental test leaks
microsoft · Apr 26, 2023 · 0c406a7 · 0c406a7
1 parent 49370ed
commit 0c406a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/scripts/jest/src/jest.preset.v0.js b/scripts/jest/src/jest.preset.v0.js
@@ -16,6 +16,8 @@ const createConfig = (/** @type {import('@jest/types').Config.InitialOptions} */
   verbose: false,
   watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
   testEnvironment: 'jsdom',
+  restoreMocks: true,
+  clearMocks: true,
   ...customConfig,
   moduleNameMapper: {
     ...getLernaAliases({

diff --git a/scripts/jest/src/v0/setupTests.js b/scripts/jest/src/v0/setupTests.js
@@ -3,8 +3,8 @@
  * This is the bootstrap code that is run before any tests, utils, mocks.
  */
 
-const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
+const enzyme = require('enzyme');
 
 enzyme.configure({
   adapter: new Adapter(),
@@ -16,11 +16,4 @@ if (process.env.TF_BUILD) {
   jest.spyOn(console, 'info');
   jest.spyOn(console, 'warn');
   jest.spyOn(console, 'error');
-
-  afterAll(() => {
-    expect(console.log).not.toHaveBeenCalled();
-    expect(console.info).not.toHaveBeenCalled();
-    expect(console.warn).not.toHaveBeenCalled();
-    expect(console.error).not.toHaveBeenCalled();
-  });
 }