Skip to content

Commit e944d7e

Browse files
committed
Refactor Jest scripts directory structure
Introduces a more consistent naming scheme.
1 parent ed4b018 commit e944d7e

File tree

7 files changed

+4
-7
lines changed

7 files changed

+4
-7
lines changed

scripts/jest/config.source.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ module.exports = {
88
transform: {
99
'.*': require.resolve('./preprocessor.js'),
1010
},
11-
setupFiles: [
12-
require.resolve('./setup.js'),
13-
require.resolve('./environment.js'),
14-
],
15-
setupTestFrameworkScriptFile: require.resolve('./test-framework-setup.js'),
11+
setupFiles: [require.resolve('./setupEnvironment.js')],
12+
setupTestFrameworkScriptFile: require.resolve('./setupTests.js'),
1613
testRegex: '/__tests__/.*(\\.js|\\.coffee|[^d]\\.ts)$',
1714
moduleFileExtensions: ['js', 'json', 'node', 'coffee', 'ts'],
1815
rootDir: process.cwd(),

scripts/jest/preprocessor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var path = require('path');
55
var babel = require('babel-core');
66
var coffee = require('coffee-script');
77

8-
var tsPreprocessor = require('./ts-preprocessor');
8+
var tsPreprocessor = require('./typescript/preprocessor');
99
var createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');
1010

1111
// Use require.resolve to be resilient to file moves, npm updates, etc
File renamed without changes.

scripts/jest/test-framework-setup.js renamed to scripts/jest/setupTests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
44
// Inside the class equivalence tester, we have a custom environment, let's
55
// require that instead.
6-
require('./setupSpecEquivalenceReporter.js');
6+
require('./spec-equivalence-reporter/setupTests.js');
77
} else {
88
var env = jasmine.getEnv();
99
var errorMap = require('../error-codes/codes.json');
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)