fix: fix jest tests issues

reactjs · amirabbas-gh · Feb 4, 2025 · Feb 2, 2025 · Feb 3, 2025 · Feb 3, 2025
commit c096d5b50f852564ed70e254c5ab74577f4bb835
diff --git a/transforms/__tests__/React-PropTypes-to-prop-types-test.js b/transforms/__tests__/React-PropTypes-to-prop-types-test.js
@@ -9,7 +9,7 @@
 'use strict';
 
 jest.mock('../React-PropTypes-to-prop-types', () => {
-  return Object.assign(require.requireActual('../React-PropTypes-to-prop-types'), {
+  return Object.assign(jest.requireActual('../React-PropTypes-to-prop-types'), {
     parser: 'flow'
   });
 });

diff --git a/transforms/__tests__/ReactNative-View-propTypes-test.js b/transforms/__tests__/ReactNative-View-propTypes-test.js
@@ -9,7 +9,7 @@
 'use strict';
 
 jest.mock('../ReactNative-View-propTypes', () => {
-  return Object.assign(require.requireActual('../ReactNative-View-propTypes'), {
+  return Object.assign(jest.requireActual('../ReactNative-View-propTypes'), {
     parser: 'flow'
   });
 });

diff --git a/transforms/__tests__/create-element-to-jsx-test.js b/transforms/__tests__/create-element-to-jsx-test.js
@@ -9,7 +9,7 @@
 'use strict';
 
 jest.mock('../create-element-to-jsx', () => {
-  return Object.assign(require.requireActual('../create-element-to-jsx'), {
+  return Object.assign(jest.requireActual('../create-element-to-jsx'), {
     parser: 'flow'
   });
 });

diff --git a/transforms/__tests__/manual-bind-to-arrow-test.js b/transforms/__tests__/manual-bind-to-arrow-test.js
@@ -9,7 +9,7 @@
 'use strict';
 
 jest.mock('../manual-bind-to-arrow', () => {
-  return Object.assign(require.requireActual('../manual-bind-to-arrow'), {
+  return Object.assign(jest.requireActual('../manual-bind-to-arrow'), {
     parser: 'flow'
   });
 });

diff --git a/transforms/__tests__/pure-component-test.js b/transforms/__tests__/pure-component-test.js
@@ -9,7 +9,7 @@
 'use strict';
 
 jest.mock('../pure-component', () => {
-  return Object.assign(require.requireActual('../pure-component'), {
+  return Object.assign(jest.requireActual('../pure-component'), {
     parser: 'flow'
   });
 });

diff --git a/transforms/__tests__/rename-unsafe-lifecycles-test.js b/transforms/__tests__/rename-unsafe-lifecycles-test.js
@@ -26,7 +26,7 @@ describe('rename-unsafe-lifecycles', () => {
     beforeEach(() => {
       jest.mock('../rename-unsafe-lifecycles', () => {
         return Object.assign(
-          require.requireActual('../rename-unsafe-lifecycles'),
+          jest.requireActual('../rename-unsafe-lifecycles'),
           {
             parser: 'flow'
           }
@@ -52,7 +52,7 @@ describe('rename-unsafe-lifecycles', () => {
     beforeEach(() => {
       jest.mock('../rename-unsafe-lifecycles', () => {
         return Object.assign(
-          require.requireActual('../rename-unsafe-lifecycles'),
+          jest.requireActual('../rename-unsafe-lifecycles'),
           {
             parser: 'tsx'
           }

diff --git a/transforms/__tests__/update-react-imports-test.js b/transforms/__tests__/update-react-imports-test.js
@@ -42,14 +42,14 @@ const destructureNamedImportTests = [
 ];
 
 jest.mock('../update-react-imports', () => {
-  return Object.assign(require.requireActual('../update-react-imports'), {
+  return Object.assign(jest.requireActual('../update-react-imports'), {
     parser: 'flow',
   });
 });
 
 const defineTest = require('jscodeshift/dist/testUtils').defineTest;
 
-[...tests, ...flowOnlyTests].forEach((test) => {
+tests.forEach((test) => {
   defineTest(
     __dirname,
     'update-react-imports',
@@ -58,11 +58,22 @@ const defineTest = require('jscodeshift/dist/testUtils').defineTest;
   );
 });
 
+
+destructureNamedImportTests.forEach((test) => {
+  defineTest(
+    __dirname,
+    'update-react-imports',
+    {destructureNamespaceImports: true},
+    `update-react-imports/${test}`
+  );
+});
+
+
 describe('typescript', () => {
   beforeEach(() => {
     jest.mock('../update-react-imports', () => {
       return Object.assign(
-        require.requireActual('../update-react-imports'),
+        jest.requireActual('../update-react-imports'),
         {
           parser: 'tsx'
         }
@@ -74,21 +85,12 @@ describe('typescript', () => {
     jest.resetModules();
   });
 
-  [...tests, ...tsOnlyTests].forEach((test) => {
+  tsOnlyTests.forEach((test) => {
     defineTest(
       __dirname,
       'update-react-imports',
       null,
-      `update-react-imports/typescript/${test}.tsx`
+      `update-react-imports/typescript/${test}`
     );
   });
-});
-
-destructureNamedImportTests.forEach((test) => {
-  defineTest(
-    __dirname,
-    'update-react-imports',
-    {destructureNamespaceImports: true},
-    `update-react-imports/${test}`
-  );
-});
+});
diff --git a/transforms/rename-unsafe-lifecycles.js b/transforms/rename-unsafe-lifecycles.js
@@ -1,11 +1,3 @@
-/**
- * Copyright 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
 'use strict';
 
 const DEPRECATED_APIS = Object.create(null);
@@ -52,6 +44,9 @@ export default (file, api, options) => {
   // Arrow functions
   root.find(j.ClassProperty).forEach(renameDeprecatedApis);
 
+  // TypeScript class fields
+  root.find(j.PropertyDefinition).forEach(renameDeprecatedApis);
+
   // createReactClass and mixins
   root.find(j.Property).forEach(renameDeprecatedApis);