Skip to content

Commit c096d5b

Browse files
committed
fix: fix jest tests issues
1 parent 062c795 commit c096d5b

8 files changed

+27
-30
lines changed

transforms/__tests__/React-PropTypes-to-prop-types-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'use strict';
1010

1111
jest.mock('../React-PropTypes-to-prop-types', () => {
12-
return Object.assign(require.requireActual('../React-PropTypes-to-prop-types'), {
12+
return Object.assign(jest.requireActual('../React-PropTypes-to-prop-types'), {
1313
parser: 'flow'
1414
});
1515
});

transforms/__tests__/ReactNative-View-propTypes-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'use strict';
1010

1111
jest.mock('../ReactNative-View-propTypes', () => {
12-
return Object.assign(require.requireActual('../ReactNative-View-propTypes'), {
12+
return Object.assign(jest.requireActual('../ReactNative-View-propTypes'), {
1313
parser: 'flow'
1414
});
1515
});

transforms/__tests__/create-element-to-jsx-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'use strict';
1010

1111
jest.mock('../create-element-to-jsx', () => {
12-
return Object.assign(require.requireActual('../create-element-to-jsx'), {
12+
return Object.assign(jest.requireActual('../create-element-to-jsx'), {
1313
parser: 'flow'
1414
});
1515
});

transforms/__tests__/manual-bind-to-arrow-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'use strict';
1010

1111
jest.mock('../manual-bind-to-arrow', () => {
12-
return Object.assign(require.requireActual('../manual-bind-to-arrow'), {
12+
return Object.assign(jest.requireActual('../manual-bind-to-arrow'), {
1313
parser: 'flow'
1414
});
1515
});

transforms/__tests__/pure-component-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'use strict';
1010

1111
jest.mock('../pure-component', () => {
12-
return Object.assign(require.requireActual('../pure-component'), {
12+
return Object.assign(jest.requireActual('../pure-component'), {
1313
parser: 'flow'
1414
});
1515
});

transforms/__tests__/rename-unsafe-lifecycles-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('rename-unsafe-lifecycles', () => {
2626
beforeEach(() => {
2727
jest.mock('../rename-unsafe-lifecycles', () => {
2828
return Object.assign(
29-
require.requireActual('../rename-unsafe-lifecycles'),
29+
jest.requireActual('../rename-unsafe-lifecycles'),
3030
{
3131
parser: 'flow'
3232
}
@@ -52,7 +52,7 @@ describe('rename-unsafe-lifecycles', () => {
5252
beforeEach(() => {
5353
jest.mock('../rename-unsafe-lifecycles', () => {
5454
return Object.assign(
55-
require.requireActual('../rename-unsafe-lifecycles'),
55+
jest.requireActual('../rename-unsafe-lifecycles'),
5656
{
5757
parser: 'tsx'
5858
}

transforms/__tests__/update-react-imports-test.js

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ const destructureNamedImportTests = [
4242
];
4343

4444
jest.mock('../update-react-imports', () => {
45-
return Object.assign(require.requireActual('../update-react-imports'), {
45+
return Object.assign(jest.requireActual('../update-react-imports'), {
4646
parser: 'flow',
4747
});
4848
});
4949

5050
const defineTest = require('jscodeshift/dist/testUtils').defineTest;
5151

52-
[...tests, ...flowOnlyTests].forEach((test) => {
52+
tests.forEach((test) => {
5353
defineTest(
5454
__dirname,
5555
'update-react-imports',
@@ -58,11 +58,22 @@ const defineTest = require('jscodeshift/dist/testUtils').defineTest;
5858
);
5959
});
6060

61+
62+
destructureNamedImportTests.forEach((test) => {
63+
defineTest(
64+
__dirname,
65+
'update-react-imports',
66+
{destructureNamespaceImports: true},
67+
`update-react-imports/${test}`
68+
);
69+
});
70+
71+
6172
describe('typescript', () => {
6273
beforeEach(() => {
6374
jest.mock('../update-react-imports', () => {
6475
return Object.assign(
65-
require.requireActual('../update-react-imports'),
76+
jest.requireActual('../update-react-imports'),
6677
{
6778
parser: 'tsx'
6879
}
@@ -74,21 +85,12 @@ describe('typescript', () => {
7485
jest.resetModules();
7586
});
7687

77-
[...tests, ...tsOnlyTests].forEach((test) => {
88+
tsOnlyTests.forEach((test) => {
7889
defineTest(
7990
__dirname,
8091
'update-react-imports',
8192
null,
82-
`update-react-imports/typescript/${test}.tsx`
93+
`update-react-imports/typescript/${test}`
8394
);
8495
});
85-
});
86-
87-
destructureNamedImportTests.forEach((test) => {
88-
defineTest(
89-
__dirname,
90-
'update-react-imports',
91-
{destructureNamespaceImports: true},
92-
`update-react-imports/${test}`
93-
);
94-
});
96+
});

transforms/rename-unsafe-lifecycles.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
/**
2-
* Copyright 2015-present, Facebook, Inc.
3-
*
4-
* This source code is licensed under the MIT license found in the
5-
* LICENSE file in the root directory of this source tree.
6-
*
7-
*/
8-
91
'use strict';
102

113
const DEPRECATED_APIS = Object.create(null);
@@ -52,6 +44,9 @@ export default (file, api, options) => {
5244
// Arrow functions
5345
root.find(j.ClassProperty).forEach(renameDeprecatedApis);
5446

47+
// TypeScript class fields
48+
root.find(j.PropertyDefinition).forEach(renameDeprecatedApis);
49+
5550
// createReactClass and mixins
5651
root.find(j.Property).forEach(renameDeprecatedApis);
5752

0 commit comments

Comments
 (0)