Hoist also jest.* calls that are not expression statements

jestjs · Feb 28, 2023 · 6b9af46 · 6b9af46
1 parent ddac69b
commit 6b9af46
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/packages/babel-plugin-jest-hoist/src/__tests__/__snapshots__/hoistPlugin.test.ts.snap b/packages/babel-plugin-jest-hoist/src/__tests__/__snapshots__/hoistPlugin.test.ts.snap
@@ -220,8 +220,8 @@ jest.mock('some-module', () => {
       ↓ ↓ ↓ ↓ ↓ ↓
 
 _getJestObj().mock('some-module', () => {
-  const actual = jest.requireActual('some-module');
-  return jest.fn();
+  const actual = _getJestObj().requireActual('some-module');
+  return _getJestObj().fn();
 });
 function _getJestObj() {
   const {jest} = require('@jest/globals');
@@ -243,7 +243,7 @@ jest.mock('some-module', () => {
       ↓ ↓ ↓ ↓ ↓ ↓
 
 _getJestObj().mock('some-module', () => {
-  const module = jest.requireActual('some-module');
+  const module = _getJestObj().requireActual('some-module');
   _getJestObj().spyOn(module, 'add');
   return module;
 });
@@ -271,7 +271,7 @@ jest.mock('some-module', () => {
       ↓ ↓ ↓ ↓ ↓ ↓
 
 _getJestObj().mock('some-module', () => {
-  const Actual = jest.requireActual('some-module');
+  const Actual = _getJestObj().requireActual('some-module');
   return class Mocked extends Actual {
     constructor() {
       super();
@@ -286,3 +286,25 @@ function _getJestObj() {
 }
 
 `;
+
+exports[`babel-plugin-jest-hoist 13. jest.mock call nested inside a statement: 13. jest.mock call nested inside a statement 1`] = `
+
+jest.mock('someModule', () => {
+  require('x');
+  expect(jest.mock('someNode')).toBe(1);
+});
+
+
+      ↓ ↓ ↓ ↓ ↓ ↓
+
+_getJestObj().mock('someModule', () => {
+  expect(_getJestObj().mock('someNode')).toBe(1);
+  require('x');
+});
+function _getJestObj() {
+  const {jest} = require('@jest/globals');
+  _getJestObj = () => jest;
+  return jest;
+}
+
+`;
diff --git a/packages/babel-plugin-jest-hoist/src/__tests__/hoistPlugin.test.ts b/packages/babel-plugin-jest-hoist/src/__tests__/hoistPlugin.test.ts
@@ -177,6 +177,16 @@ pluginTester({
       formatResult,
       snapshot: true,
     },
+    'jest.mock call nested inside a statement': {
+      code: formatResult(`
+        jest.mock('someModule', () => {
+          require('x');
+          expect(jest.mock('someNode')).toBe(1);
+        });
+      `),
+      formatResult,
+      snapshot: true,
+    },
   },
   /* eslint-enable */
 });
diff --git a/packages/babel-plugin-jest-hoist/src/index.ts b/packages/babel-plugin-jest-hoist/src/index.ts
@@ -340,10 +340,8 @@ export default function jestHoist(): PluginObj<{
       };
     },
     visitor: {
-      ExpressionStatement(exprStmt) {
-        const jestObjInfo = extractJestObjExprIfHoistable(
-          exprStmt.get('expression'),
-        );
+      CallExpression(callExpr) {
+        const jestObjInfo = extractJestObjExprIfHoistable(callExpr);
         if (jestObjInfo) {
           const jestCallExpr = callExpression(
             this.declareJestObjGetterIdentifier(),